Backport PR coq#16970: CI: do not set interruptible:true on protected…

… branches
Matafou · Mar 31, 2023 · 686e934 · 686e934
2 parents db9e7d0 + 4380c4b
commit 686e934
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,8 +1,16 @@
 image: "$IMAGE"
 
-default:
-  interruptible: true
-  timeout: 1h
+include:
+  - local: '/dev/ci/gitlab-modes/protected-mode.yml'
+    rules:
+      - if: $CI_COMMIT_BRANCH == "master"
+      - if: $CI_COMMIT_BRANCH =~ /^v.*\..*$/
+
+  - local: "/dev/ci/gitlab-modes/normal-mode.yml"
+    rules:
+      - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH !~ /^v.*\..*$/
+
+  - local: '/dev/bench/gitlab-bench.yml'
 
 stages:
   - docker
@@ -28,9 +36,6 @@ variables:
   OPAM_VARIANT: ""
   GIT_DEPTH: "10"
 
-include:
-  - local: '/dev/bench/gitlab-bench.yml'
-
 before_script:
   - dev/ci/gitlab-section.sh start before_script before_script
   - cat /proc/{cpu,mem}info || true

diff --git a/dev/ci/gitlab-modes/normal-mode.yml b/dev/ci/gitlab-modes/normal-mode.yml
@@ -0,0 +1,4 @@
+
+default:
+  interruptible: true
+  timeout: 1h
diff --git a/dev/ci/gitlab-modes/protected-mode.yml b/dev/ci/gitlab-modes/protected-mode.yml
@@ -0,0 +1,4 @@
+
+default:
+  interruptible: false
+  timeout: 1h