Merge branch 'gen_proofmode' of gitlab.mpi-sws.org:jtassaro/fri-coq into gen_proofmode

.gitlab-ci.yml

@@ -16,7 +16,6 @@ variables:
   - env | egrep '^(CI_BUILD_REF|CI_RUNNER)' > build-env.txt
   # build
   - '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'

opam

@@ -5,6 +5,6 @@ build: [make "-j%{jobs}%"]
 install: [make "install"]
 remove: ["rm" "-rf" "'%{lib}%/coq/user-contrib/fri"]
 depends: [
-  "coq" { (>= "8.7") | (= "dev") }
+  "coq" { (>= "8.7.2") | (= "dev") }
   "coq-iris"  { (= "branch.gen_proofmode.2018-03-04.7") | (= "dev") }
 ]