Merge branch 'master' into coq8.8_compat

.gitlab-ci.yml

-image: localhost:5000/flover
+image: heikobecker/coq-polyml-ci
 
 variables:
     GIT_SUBMODULE_STRATEGY: none

scripts/ci-coq.sh

@@ -10,7 +10,7 @@ make -j
 
 make clean
 
-opam switch coq8.8
-eval `opam config env`
-./configure_coq.sh
-make -j
+#opam switch coq8.8
+#eval `opam config env`
+#./configure_coq.sh
+#make -j

scripts/ci-hol4.sh

 #!/bin/bash
 
-if [[ "$HOLDIR" = "" ]]
-then
-    #We must be running on ci-server
-    echo "HOLDIR not set, starting to install HOL4 into current directory."
-    echo "If this is not intended, please abort with Ctrl-c"
-    sleep 5
-
-    #Set HOL4 commit variable
-    HOLCOMMIT="$(cat ./hol4/.HOLCOMMIT)"
-    git clone https://github.com/HOL-Theorem-Prover/HOL.git HOL4
-    cd HOL4
-    git checkout $HOLCOMMIT
-    poly < tools/smart-configure.sml
-    bin/build
-    export HOLDIR="$(pwd)"
-    cd ../
-fi
+#We must be running on ci-server
+echo "HOLDIR not set, starting to install HOL4 into current directory."
+echo "If this is not intended, please abort with Ctrl-c"
+sleep 5
+
+#Set HOL4 commit variable
+HOLCOMMIT="$(cat ./hol4/.HOLCOMMIT)"
+git clone https://github.com/HOL-Theorem-Prover/HOL.git HOL4
+cd HOL4
+git checkout $HOLCOMMIT
+poly < tools/smart-configure.sml
+bin/build
+export HOLDIR="$(pwd)"
+cd ../
+
 
 cd ./hol4