From a9a865a94ff4ca1f24fafcc0b7313eb493958f13 Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Wed, 19 Sep 2018 08:42:34 +0200
Subject: [PATCH] use Docker image matching CI branch
---
.gitlab-ci.yml | 8 ++++----
ci | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
delete mode 160000 ci
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e8ee44c1..a9a35c5cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,25 @@
-image: ralfjung/opam-ci:latest
+image: ralfjung/opam-ci:opam2
stages:
- build
variables:
CPU_CORES: "10"
- GIT_SUBMODULE_STRATEGY: "recursive"
.template: &template
stage: build
tags:
- fp
script:
+ - git clone https://gitlab.mpi-sws.org/FP/iris-ci.git ci -b opam2
- ci/buildjob
cache:
- key: "iris-3.1-$CI_JOB_NAME"
+ key: "$CI_JOB_NAME-iris-3.1"
paths:
- opamroot/
only:
- - /^ci/
- iris-3.1
+ - /^ci/
except:
- triggers
- schedules
diff --git a/ci b/ci
deleted file mode 160000
index c3b53061d..000000000
--- a/ci
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c3b53061d2452f7ea50766915eb40312163d155a
--
GitLab