diff options
| author | coqbot | 2020-08-24 13:43:12 +0200 |
|---|---|---|
| committer | GitHub | 2020-08-24 13:43:12 +0200 |
| commit | 59f383ad7f460b9a4a438fb7b84f8c071f960351 (patch) | |
| tree | 68e4c04ec89f2f521bc25f891ace223d8ff89ca1 | |
| parent | 80aca0417e2ed8530b10185fda1cf8a9673e196d (diff) | |
| parent | 6f185424a9b8299b3e32ffbed110d5372a786b04 (diff) | |
Merge PR #12832: Introduce GitHub Action to check for conflicts in PRs.
Reviewed-by: SkySkimmer
| -rw-r--r-- | .github/CODEOWNERS | 1 | ||||
| -rw-r--r-- | .github/workflows/check-conflicts.yml | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8dbdf43e52..c4d202470d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -23,6 +23,7 @@ /dev/ci/ @coq/ci-maintainers /.travis.yml @coq/ci-maintainers /.gitlab-ci.yml @coq/ci-maintainers +/.github/workflows @coq/ci-maintainers /azure-pipelines.yml @coq/ci-maintainers /Makefile.ci @coq/ci-maintainers 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 }}" |