diff options
| author | Théo Zimmermann | 2020-08-12 17:53:54 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2020-08-21 16:31:04 +0200 |
| commit | c424aea1f9c3fa7da042618eb034619dd6a3bf01 (patch) | |
| tree | 73f4e93fc6f3fd59a3ed41be6e0b153cd9a7a901 | |
| parent | 85dad6f7b52c8b84a87e61eb45dbc1f28c8780ae (diff) | |
Introduce GitHub Action to check for conflicts in PRs.
Alternative to adding this feature to coqbot (coq/bot#14).
| -rw-r--r-- | .github/workflows/check-conflicts.yml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/.github/workflows/check-conflicts.yml b/.github/workflows/check-conflicts.yml new file mode 100644 index 0000000000..33ed944488 --- /dev/null +++ b/.github/workflows/check-conflicts.yml @@ -0,0 +1,13 @@ +name: "Check conflicts" +on: [push] +# Only on push because @coqbot already takes care of checking for +# conflicts when PRs are opened or synchronized + +jobs: + main: + runs-on: ubuntu-latest + steps: + - uses: eps1lon/actions-label-merge-conflict@b8bf8341285ec9a4567d4318ba474fee998a6919 + with: + dirtyLabel: "needs: rebase" + repoToken: "${{ secrets.GITHUB_TOKEN }}" |