From c424aea1f9c3fa7da042618eb034619dd6a3bf01 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Wed, 12 Aug 2020 17:53:54 +0200
Subject: Introduce GitHub Action to check for conflicts in PRs.

Alternative to adding this feature to coqbot (coq/bot#14).
---
 .github/workflows/check-conflicts.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/check-conflicts.yml

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 }}"
-- 
cgit v1.2.3


From 6f185424a9b8299b3e32ffbed110d5372a786b04 Mon Sep 17 00:00:00 2001
From: Théo Zimmermann
Date: Wed, 12 Aug 2020 18:14:09 +0200
Subject: Add Actions to CI realm in CODEOWNERS.

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

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
 
-- 
cgit v1.2.3