update CI

.gitlab-ci.yml

@@ -4,12 +4,12 @@ stages:
   - build
 
 variables:
-  CPU_CORES: "9"
+  CPU_CORES: "10"
 
 .template: &template
   stage: build
   tags:
-  - fp-timing
+  - fp
   script:
   # prepare
   - . build/opam-ci.sh $OPAM_PINS
@@ -18,6 +18,8 @@ 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'
+  # maybe validate
+  - 'if [[ -n "$VALIDATE" ]]; then make validate; fi'
   cache:
     key: "$CI_JOB_NAME"
     paths:
@@ -25,28 +27,31 @@ variables:
   only:
   - master
   - /^ci/
+  except:
+  - triggers
+
+## Build jobs
 
 build-coq.8.7.1:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.7.1   coq-mathcomp-ssreflect version 1.6.4"
-  except:
-  - triggers
+  tags:
+  - fp-timing
+  artifacts:
+    paths:
+    - build-time.txt
+    - build-env.txt
 
 build-coq.8.6.1:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.6.1   coq-mathcomp-ssreflect version 1.6.4"
-  artifacts:
-    paths:
-    - build-time.txt
-    - build-env.txt
-  except:
-  - triggers
 
 build-iris.dev:
   <<: *template
   variables:
     OPAM_PINS: "coq version 8.7.1   coq-mathcomp-ssreflect version 1.6.4   coq-iris.dev git https://gitlab.mpi-sws.org/FP/iris-coq.git#$IRIS_REV"
+  except:
   only:
   - triggers

Makefile

@@ -15,7 +15,7 @@ clean: Makefile.coq
 # Create Coq Makefile. POSIX awk can't do in-place editing, but coq_makefile wants the real
 # filename, so we do some file gymnastics.
 Makefile.coq: _CoqProject Makefile awk.Makefile
-	coq_makefile -f _CoqProject -o Makefile.coq
+	"$(COQBIN)coq_makefile" -f _CoqProject -o Makefile.coq
 	mv Makefile.coq Makefile.coq.tmp && awk -f awk.Makefile Makefile.coq.tmp > Makefile.coq && rm Makefile.coq.tmp
 
 # Install build-dependencies

build/opam-ci.sh

@@ -63,5 +63,6 @@ echo "[opam-ci] Installing build-dependencies"
 make build-dep OPAMFLAGS=-y
 
 # done
+set +x
 echo
 coqc -v