more parallel CI

.gitlab-ci.yml

@@ -2,8 +2,7 @@ image: ralfjung/opam-ci:latest
 
 stages:
   - build
-  - deploy
-  - build_more
+  - reverse-deps
 
 variables:
   CPU_CORES: "9"
@@ -20,7 +19,10 @@ variables:
   - 'time make -k -j$CPU_CORES TIMED=y 2>&1 | tee build-log.txt'
   - 'if fgrep Axiom build-log.txt >/dev/null; then exit 1; fi'
   - 'cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \((real|user): [0-9]" | tee build-time.txt'
-  - 'if test -n "$VALIDATE"; then make validate; fi'
+  # maybe validate
+  - 'if [[ -n "$VALIDATE" ]]; then make validate; fi'
+  # maybe create opam package
+  - 'if [[ -n "$OPAM_PKG" && "$CI_COMMIT_REF_NAME" == master ]]; then curl --fail -X POST -F "token=$OPAM_UPDATE_SECRET" -F "ref=master" -F "variables[REPO]=$CI_PROJECT_URL.git" -F "variables[REF]=$CI_COMMIT_REF_NAME" -F "variables[SHA]=$CI_COMMIT_SHA" -F "variables[NAME]=$OPAM_PKG" https://gitlab.mpi-sws.org/api/v4/projects/581/trigger/pipeline; fi'
   cache:
     key: "$CI_JOB_NAME"
     paths:
@@ -28,21 +30,11 @@ variables:
   only:
   - master
   - /^ci/
-
-opam:
-  stage: deploy
-  script:
-  # Send a trigger to the repository doing the work
-  - curl --fail -X POST -F "token=$OPAM_UPDATE_SECRET" -F "ref=master" -F "variables[REPO]=$CI_PROJECT_URL.git" -F "variables[REF]=$CI_COMMIT_REF_NAME" -F "variables[SHA]=$CI_COMMIT_SHA" -F "variables[NAME]=$OPAM_PKG" https://gitlab.mpi-sws.org/api/v4/projects/581/trigger/pipeline
-  variables:
-    OPAM_PKG: "coq-iris"
-  only:
-  - master
   except:
   - triggers
 
 reverse-deps:
-  stage: deploy
+  stage: reverse-deps
   script:
   # Send a trigger to reverse dependencies to have them tested
   - curl --fail -X POST -F "token=$IRIS_EXAMPLES_SECRET" -F "ref=master" -F "variables[IRIS_REV]=$CI_COMMIT_SHA" https://gitlab.mpi-sws.org/api/v4/projects/615/trigger/pipeline
@@ -51,39 +43,32 @@ reverse-deps:
   except:
   - triggers
 
+## Build jobs
+
 build-coq.dev:
   <<: *template
-  stage: build_more
   variables:
     OPAM_PINS: "coq version dev   coq-mathcomp-ssreflect version dev"
     VALIDATE: "1"
-  except:
-  - triggers
 
 build-coq.8.7.1:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.7.1   coq-mathcomp-ssreflect version 1.6.4"
+    OPAM_PKG: "coq-iris"
   tags:
   - fp-timing
   artifacts:
     paths:
     - build-time.txt
     - build-env.txt
-  except:
-  - triggers
 
 build-coq.8.7.0:
   <<: *template
-  stage: build_more
   variables:
     OPAM_PINS: "coq version 8.7.0   coq-mathcomp-ssreflect version 1.6.4"
-  except:
-  - triggers
 
 build-coq.8.6.1:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.6.1   coq-mathcomp-ssreflect version 1.6.4"
-  except:
-  - triggers