docker: invoke makefile rules, keep bundle as artefact

.gitlab-ci.yml

@@ -3,20 +3,14 @@ tests_without_recompilation:
   image: debian@sha256:7ceacc4462a98718b236cbdeb850d4b7603afe4bab791336a0ed1c030f769f02
   script:
    - apt-get update
-   - apt-get install -y ocaml-nox
-  #Eclipse Prolog compilation of COLIBRI
-   - ocamlopt -o compile_colibri unix.cmxa compile_colibri.ml
-   - ./compile_colibri
-  #Bundle in bundle directory
-   - ./bundle.sh bundle
-   - cp -ra Bin/ECLIPSE_V7.0_45/ bundle/ECLIPSE/
-  #Test
-   - apt-get update
-   - apt-get install -y parallel
-   - ./test.sh -j2
+   - apt-get install -y make ocaml-nox parallel
+   - make
+   - make install
+   - make test
   artifacts:
     paths:
      - logs
+     - bundle
     expire_in: 1 week
   tags:
     - docker
@@ -25,21 +19,18 @@ tests_with_recompilation:
   #ocaml/opam:debian-10-ocaml-4.11
   image: ocaml/opam@sha256:eaabdd3f42bd1ddfaa4b670b6bfb0acf3790a8927255d3fbc40576252798ce76
   script:
-   - rm -f Src/COLIBRI/lib/v7/x86_64_linux/* Src/COLIBRI/simplex_ocaml.pl
-  #OCaml dependencies
-   - opam depext --install "dune.2.7.1" "ocplib-simplex.0.4" "zarith.1.9.1" "parsexp.v0.14.0" "menhir.20200624" "fmt.0.8.8" "spelll.0.3" "uutf.1.0.2" "gen.0.5.3"
-  #OCaml compilation
-   - make ECLIPSEBIN=$(pwd)/Bin/ECLIPSE_V7.0_45/
-  #Bundle in bundle directory
-   - ./bundle.sh bundle
-   - cp -ra Bin/ECLIPSE_V7.0_45/ bundle/ECLIPSE/
-  #Test
    - sudo apt-get update
-   - sudo apt-get install -y parallel
-   - ./test.sh -j2
+   - sudo apt-get install -y make parallel
+   - opam install "dune.2.7.1" "ocplib-simplex.0.5" "zarith.1.9.1" "parsexp.v0.14.0" "menhir.20200624" "fmt.0.8.8" "spelll.0.3" "uutf.1.0.2" "gen.0.5.3"
+   - make clean
+   - make clean_install
+   - make
+   - make install
+   - make test
   artifacts:
     paths:
      - logs
+     - bundle
     expire_in: 1 week
   tags:
     - docker

Makefile

@@ -134,3 +134,6 @@ install: $(BUNDLE) $(BUNDLE)/colibri.exe
 	cp -ra compile_flag.pl $(BUNDLE)/COLIBRI/
 	cp -ra version $(BUNDLE)/
 	cp -ra $(ECLIPSEBIN) $(BUNDLE)/ECLIPSE/
+
+test:
+	./test.sh -j2