aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/CODEOWNERS4
-rw-r--r--.github/workflows/check-conflicts.yml13
2 files changed, 17 insertions, 0 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8dbdf43e52..b7418f54bd 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
@@ -33,6 +34,8 @@
# Trick to avoid getting review requests
# each time someone adds an overlay
+/dev/bench/ @coq/bench-maintainers
+
########## Documentation ##########
/README.md @coq/doc-maintainers
@@ -103,6 +106,7 @@
/kernel/native* @coq/vm-native-maintainers
/kernel/vm* @coq/vm-native-maintainers
/kernel/vconv.* @coq/vm-native-maintainers
+/kernel/genOpcodefiles.* @coq/vm-native-maintainers
/kernel/sorts.* @coq/universes-maintainers
/kernel/uGraph.* @coq/universes-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 }}"