Commit Graph

22 Commits

Author SHA1 Message Date
dependabot[bot]
d7b35aaf1e
Bump actions/setup-node from 2.4.0 to 2.4.1
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.4.0...v2.4.1)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-27 16:05:17 +00:00
Fernando Fernández
54940d2829
Add rebase command 2021-09-03 17:40:05 +02:00
Anthony Lavado
8a8872d2c6
Merge pull request #2821 from thornbill/merge-conflict-action-event 2021-08-09 18:01:38 -04:00
dependabot[bot]
329dadb8c3
Bump actions/setup-node from 2.3.0 to 2.4.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.3.0...v2.4.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-09 19:49:01 +00:00
Bill Thornton
9c2c84cb64 Update merge conflict action trigger 2021-08-09 11:29:22 -04:00
dependabot[bot]
988fb5b0ae
Bump actions/setup-node from 2.2.0 to 2.3.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.2.0...v2.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-01 16:03:40 +00:00
dependabot[bot]
86351ea0a6
Bump actions/setup-node from 2.1.5 to 2.2.0
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.1.5 to 2.2.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.1.5...v2.2.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 16:01:26 +00:00
Fernando Fernández
0f42f9afbc
Address review comments 2021-06-23 20:58:45 +02:00
Fernando Fernández
fbbafa2e2d
Format workflow as in other repos and address review comments 2021-06-23 20:54:40 +02:00
Fernando Fernández
d3b3c29ced
chore(ci): replace with actions-label-merge-conflict 2021-06-23 20:43:40 +02:00
dependabot[bot]
8593b026fc
Bump actions/cache from 2.1.5 to 2.1.6
Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 05:47:23 +00:00
dependabot[bot]
7fb4384708
Bump actions/cache from v2.1.4 to v2.1.5
Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.4...1a9e2138d905efd099035b49d8b7a3888c653ca8)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-01 05:54:16 +00:00
Fernando Fernández
6efef9680d Switch to npm 2021-04-08 00:34:03 +02:00
Fernando Fernández
8ce58f611b
Run merge conflict check on PR rebase/commit 2021-03-24 00:47:15 +01:00
Bill Thornton
158e435144 Prevent merge conflicts action from running on forks 2020-12-02 12:10:10 -05:00
Joshua M. Boniface
c23df6fa3f
Merge pull request #2117 from thornbill/github-action-linters
Add linters to github actions
2020-12-01 22:28:16 -05:00
Bill Thornton
fe3bd2e35d Add github action to label PRs with merge conflicts 2020-12-01 10:01:56 -05:00
Bill Thornton
e79e9e5f92 Use matchers instead of custom actions 2020-11-30 10:38:01 -05:00
Bill Thornton
4c0ecba84a Cache node_modules and use frozen lockfile 2020-11-30 10:11:55 -05:00
Bill Thornton
7ee40d841d Add stylelint task for sass files 2020-11-30 09:59:30 -05:00
Bill Thornton
9d6ea51be1 Add linters to github actions 2020-11-30 09:49:09 -05:00
Mario Campos
168b8ec143
Create codeql-analysis.yml 2020-11-21 12:55:47 -06:00