unify CI

.gitlab-ci.yml

@@ -21,7 +21,7 @@ variables:
   - 'cat build-log.txt | egrep "[a-zA-Z0-9_/-]+ \((real|user): [0-9]" | tee build-time.txt'
   - 'if test -n "$VALIDATE" && (( RANDOM % 10 == 0 )); then make validate; fi'
   cache:
-    key: "coq$COQ_VERSION"
+    key: "coq.$COQ_VERSION"
     paths:
     - opamroot/
   only:
@@ -32,26 +32,28 @@ opam:
   stage: opam
   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]=coq-stdpp" https://gitlab.mpi-sws.org/api/v3/projects/581/trigger/builds
+  - 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/v3/projects/581/trigger/builds
+  variables:
+    OPAM_PKG: "coq-stdpp"
   only:
   - master
 
-stdpp-coq8.7:
+build-coq8.7:
   <<: *template
   variables:
     COQ_VERSION: "8.7.dev"
 
-stdpp-coq8.6.1:
+build-coq8.6.1:
   <<: *template
   variables:
     COQ_VERSION: "8.6.1"
-    VALIDATE: 1
+    VALIDATE: "1"
   artifacts:
     paths:
     - build-time.txt
     - build-env.txt
 
-stdpp-coq8.6:
+build-coq8.6:
   <<: *template
   variables:
     COQ_VERSION: "8.6"