From 8a567c37175a8adbdbcf8b890ad7e30b2d4e83ec Mon Sep 17 00:00:00 2001
From: Timo Koch <timokoch@math.uio.no>
Date: Sat, 21 Aug 2021 16:25:45 +0000
Subject: [PATCH] [ci] Test with dune 2.8 instead of dune 2.7
---
.gitlab-ci.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 539c4238fc..dbd565826e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ stages:
variables:
IMAGE_REGISTRY_URL: $CI_REGISTRY/dumux-repositories/dumux-docker-ci
DUMUX_CI_TRIGGER_LECTURE_BRANCH: master
+ DUMUX_CI_DUNE_LATEST_RELEASE: "2.8"
# Cases in which to create pipelines at all. The trigger jobs may further
# specify how exactly they should be created in different situations.
@@ -20,7 +21,7 @@ workflow:
# pipeline on a related merge request already. If yes, we simply return
# to propagate that pipeline status on master. Otherwise, we trigger a new run.
check-pipeline-status:
- image: $IMAGE_REGISTRY_URL/full:dune-2.7-gcc-ubuntu-20.04
+ image: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-20.04
stage: check-status
rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
@@ -92,20 +93,20 @@ check-pipeline-status:
#############################################
# pipelines to be created in merge requests #
-full-dune-2.7-gcc:
+full-dune-latest-release-gcc:
extends: .base-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/full:dune-2.7-gcc-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-20.04
-minimal-dune-2.7-gcc:
+minimal-dune-latest-release-gcc:
extends: .base-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/minimal:dune-2.7-gcc-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/minimal:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-gcc-ubuntu-20.04
-full-dune-2.7-clang:
+full-dune-latest-release-clang:
extends: .base-trigger
variables:
- IMAGE: $IMAGE_REGISTRY_URL/full:dune-2.7-clang-ubuntu-20.04
+ IMAGE: $IMAGE_REGISTRY_URL/full:dune-$DUMUX_CI_DUNE_LATEST_RELEASE-clang-ubuntu-20.04
full-dune-master-gcc:
extends: .base-trigger
--
GitLab