From ad3b41c639cae802e600b2264346a873722a2f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20M=C3=BCthing?=
<steffen.muething@iwr.uni-heidelberg.de>
Date: Fri, 29 Jun 2018 14:52:23 +0200
Subject: [PATCH] Update CI config for 2.6 release branch
---
.gitlab-ci.yml | 52 +++++++++++++++++++++++++++++++++++++-------------
1 file changed, 39 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51cbf5d5c..e29333556 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,28 +1,54 @@
---
-debian:10 gcc:c++17:
- image: duneci/base:10
+
+before_script:
+ - . /duneci/bin/duneci-init-job
+
+
+debian:10 gcc-8-17:
+ image: registry.dune-project.org/docker/ci/debian:10
+ script: duneci-standard-test
+ variables:
+ DUNECI_TOOLCHAIN: gcc-8-17
+ tags: [duneci]
+
+debian:10 clang-6-libcpp-17:
+ image: registry.dune-project.org/docker/ci/debian:10
+ script: duneci-standard-test
+ variables:
+ DUNECI_TOOLCHAIN: clang-6-libcpp-17
+ tags: [duneci]
+
+debian:9 gcc-6-14:
+ image: registry.dune-project.org/docker/ci/debian:9
script: duneci-standard-test
- variables: {DUNECI_OPTS: /duneci/opts.gcc.c++17}
+ variables:
+ DUNECI_TOOLCHAIN: gcc-6-14
tags: [duneci]
-debian:9--gcc:
- image: duneci/base:9
+debian:9 clang-3.8-14:
+ image: registry.dune-project.org/docker/ci/debian:9
script: duneci-standard-test
+ variables:
+ DUNECI_TOOLCHAIN: clang-3.8-14
tags: [duneci]
-debian:9--clang:
- image: duneci/base:9
+ubuntu:16.04 gcc-5-14:
+ image: registry.dune-project.org/docker/ci/ubuntu:16.04
script: duneci-standard-test
- variables: {DUNECI_OPTS: /duneci/opts.clang}
+ variables:
+ DUNECI_TOOLCHAIN: gcc-5-14
tags: [duneci]
-ubuntu:16.04--gcc:
- image: duneci/base:16.04
+ubuntu:16.04 clang-3.8-14:
+ image: registry.dune-project.org/docker/ci/ubuntu:16.04
script: duneci-standard-test
+ variables:
+ DUNECI_TOOLCHAIN: clang-3.8-14
tags: [duneci]
-ubuntu:16.04--clang:
- image: duneci/base:16.04
+ubuntu:18.04 clang-6-17:
+ image: registry.dune-project.org/docker/ci/ubuntu:18.04
script: duneci-standard-test
- variables: {DUNECI_OPTS: /duneci/opts.clang}
+ variables:
+ DUNECI_TOOLCHAIN: clang-6-17
tags: [duneci]
--
GitLab