From 2b5643ea3c1c1fd81d936e435a414c01f7ff0a29 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Thu, 20 May 2021 14:22:00 +0200
Subject: [PATCH] set up CI for MRs

---
 .gitlab-ci.yml | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a384b18..101c6c57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,23 @@ stages:
 variables:
   CPU_CORES: "10"
 
+.only_branches: &only_branches
+  only:
+  - /^master/@iris/stdpp
+  - /^ci/@iris/stdpp
+
+.only_mr: &only_mr
+  only:
+  - merge_requests
+
+.branches_and_mr: &branches_and_mr
+  only:
+  - /^master/@iris/stdpp
+  - /^ci/@iris/stdpp
+  - merge_requests
+
 .template: &template
+  <<: *only_branches
   stage: build
   tags:
   - fp
@@ -17,9 +33,6 @@ variables:
     key: "$CI_JOB_NAME"
     paths:
     - _opam/
-  only:
-  - master@iris/stdpp
-  - /^ci/@iris/stdpp
   except:
   - triggers
   - schedules
@@ -45,6 +58,15 @@ build-coq.8.13.2:
   tags:
   - fp-timing
 
+# Separate MR job that does not run on fp-timing.
+build-coq.8.13.2:
+  <<: *template
+  <<: *only_mr
+  variables:
+    OPAM_PINS: "coq version 8.13.2"
+    MANGLE_NAMES: "1"
+    DENY_WARNINGS: "1"
+
 build-coq.8.12.2:
   <<: *template
   variables:
@@ -58,5 +80,6 @@ build-coq.8.11.2:
 
 build-coq.8.10.2:
   <<: *template
+  <<: *branches_and_mr
   variables:
     OPAM_PINS: "coq version 8.10.2"
-- 
GitLab