From e60a7329f97564ae7eec53c219904b174ba0ef29 Mon Sep 17 00:00:00 2001
From: David Monniaux <david.monniaux@univ-grenoble-alpes.fr>
Date: Tue, 28 Jul 2020 10:11:54 +0200
Subject: let's try directly OCaml 4.09.1

---
 .gitlab-ci.yml | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e4ef98c..964d6655 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,9 +22,8 @@ check-admitted:
     
 build_x86_64:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -44,11 +43,10 @@ build_x86_64:
 
 build_ia32:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-multilib
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -68,11 +66,10 @@ build_ia32:
 
 build_aarch64:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-aarch64-linux-gnu qemu-user
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -92,11 +89,10 @@ build_aarch64:
 
 build_arm:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-arm-linux-gnueabi qemu-user
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -117,11 +113,10 @@ build_arm:
 
 build_armhf:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-arm-linux-gnueabihf qemu-user
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -141,11 +136,10 @@ build_armhf:
 
 build_ppc:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-powerpc-linux-gnu qemu-user
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -163,11 +157,10 @@ build_ppc:
 
 build_ppc64:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-powerpc64-linux-gnu
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -185,11 +178,10 @@ build_ppc64:
 
 build_rv64:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-riscv64-linux-gnu qemu-user
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -209,11 +201,10 @@ build_rv64:
 
 build_rv32:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install gcc-riscv64-linux-gnu qemu-user
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -231,7 +222,7 @@ build_rv32:
 
 build_kvx:
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace
@@ -239,7 +230,6 @@ build_kvx:
     - rm -f download/*dkms*.deb download/*eclipse*.deb download/*llvm*.deb download/*board-mgmt* download/*oce-host* download/*pocl*
     - sudo dpkg -i download/*.deb
     - rm -rf download
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
@@ -259,7 +249,7 @@ build_kvx:
 
 pages: # TODO: change to "deploy" when "build" succeeds (or integrate with "build_kvx" above ?)
   stage: build
-  image: "coqorg/coq"
+  image: coqorg/coq:8.11.2-ocaml-4.09.1-flambda
   before_script:
     - sudo apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Check-Date=false update
     - sudo apt-get -y install sshpass openssh-client libzip4 lttng-tools liblttng-ctl-dev liblttng-ust-dev babeltrace
@@ -267,7 +257,6 @@ pages: # TODO: change to "deploy" when "build" succeeds (or integrate with "buil
     - rm -f download/*dkms*.deb download/*eclipse*.deb download/*llvm*.deb download/*board-mgmt* download/*oce-host* download/*pocl*
     - sudo dpkg -i download/*.deb
     - rm -rf download
-    - opam switch 4.07.1+flambda
     - eval `opam config env`
     - opam update
     - opam install -y menhir
-- 
cgit