From f2fb81f95e7575bb4135329b878b2f3d85ba5993 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Wed, 2 Sep 2020 17:11:56 +0200
Subject: [PATCH] Modernize CI configuration
* Do not test with libc++. As ADOL-C is built using libstd++ we get strange
linker and run-time errors.
* Mention that the problem with return value of the ADOL-C adouble
comparison operators has been fixed in version 2.7.2.
This will allow to eventually remove the code that patches dune-common
for the CI system.
* Add gcc test with Dune 2.7.
* Remove the clang test with Dune 2.6. It makes clang crash, but this
case is not important enough to make me debug it.
foo
---
.gitlab-ci.yml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c80d393..5da3b93e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ before_script: &before
- duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git
- duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-elasticity.git
-# ADOLC's comparison operators return `int` instead of `bool` which confuses
-# template meta-programming in dune-common...
+# ADOL-C's comparison operators prior to version 2.7.2 return `int` instead of `bool`,
+# which confuses template meta-programming in dune-common...
.patch-dune-common: &patch-dune-common
- |-
patch -d /duneci/modules/dune-common -p1 <<EOT
@@ -34,11 +34,12 @@ dune:2.6 gcc:
variables:
DUNECI_BRANCH: releases/2.6-1
-dune:2.6 clang:
- image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-7-libcpp-17
+dune:2.7 gcc:
+ image: registry.dune-project.org/docker/ci/dune:2.7-debian-10-gcc-8-17
+ before_script:
+ - *patch-dune-common
+ - *before
script: duneci-standard-test
- variables:
- DUNECI_BRANCH: releases/2.6-1
dune:git gcc:
image: registry.dune-project.org/docker/ci/dune:git-debian-10-gcc-8-17
@@ -48,7 +49,7 @@ dune:git gcc:
script: duneci-standard-test
dune:git clang:
- image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17
+ image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-20
before_script:
- *patch-dune-common
- *before
@@ -63,7 +64,7 @@ dune:git parmg gcc:
script: duneci-standard-test
dune:git parmg clang:
- image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17
+ image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-20
before_script:
- *patch-dune-common
- *before
--
GitLab