From 3a3df4f3e7530d0cc2697fd56016d6bb7c656081 Mon Sep 17 00:00:00 2001
From: Sylvain Boulmé <sylvain.boulme@univ-grenoble-alpes.fr>
Date: Wed, 15 Sep 2021 20:22:35 +0200
Subject: latest coq+ocaml versions

---
 .gitlab-ci.yml | 47 ++++++++++++-----------------------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28311ddc..4fbc65e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
 
 check-admitted:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-flambda
   before_script:
     - eval `opam config env`
     - opam update
@@ -24,7 +24,7 @@ check-admitted:
     
 build_x86_64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-flambda
   before_script:
     - eval `opam config env`
     - opam update
@@ -47,7 +47,7 @@ build_x86_64:
 
 build_ia32:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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
@@ -72,7 +72,7 @@ build_ia32:
 
 build_aarch64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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
@@ -97,7 +97,7 @@ build_aarch64:
 
 build_arm:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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 libc6-dev-armel-cross qemu-user
@@ -123,7 +123,7 @@ build_arm:
 
 build_armhf:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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 libc6-dev-armhf-cross qemu-user
@@ -148,7 +148,7 @@ build_armhf:
 
 build_ppc:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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 wget ninja-build libglib2.0-dev libpixman-1-dev
@@ -177,7 +177,7 @@ build_ppc:
 
 build_ppc64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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
@@ -202,7 +202,7 @@ build_ppc64:
 
 build_rv64:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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
@@ -227,7 +227,7 @@ build_rv64:
 
 build_rv32:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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
@@ -250,7 +250,7 @@ build_rv32:
 
 build_kvx:
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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
@@ -279,7 +279,7 @@ build_kvx:
 
 pages: # TODO: change to "deploy" when "build" succeeds (or integrate with "build_kvx" above ?)
   stage: build
-  image: coqorg/coq:8.12.2-ocaml-4.11.2-flambda
+  image: coqorg/coq:8.13.2-ocaml-4.12.0-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
@@ -306,26 +306,3 @@ pages: # TODO: change to "deploy" when "build" succeeds (or integrate with "buil
   rules:
     - if: '$CI_COMMIT_BRANCH == "master"'
       when: always
-
-build_aarch64_coq13:
-  stage: build
-  image: coqorg/coq:8.13.2-ocaml-4.11.2-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
-    - eval `opam config env`
-    - opam update
-    - opam install -y menhir
-  script:
-    - ./config_aarch64.sh
-    - make -j "$NJOBS"
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "kvx-work"'
-      when: always
-    - if: '$CI_COMMIT_BRANCH == "kvx-work-ssa"'
-      when: always
-    - if: '$CI_COMMIT_BRANCH == "kvx-work-velus"'
-      when: always
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      when: always
-    - when: manual
-- 
cgit