diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5dbf3f1ef27e47509d278975e5d46ab451f3e2b6..8732fb2b58a34344ca8950876bab3ee758af25a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,10 @@ before_script: &before
- duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git
- duneci-install-module https://gitlab.dune-project.org/extensions/dune-vtk.git
- duneci-install-module https://gitlab.dune-project.org/fufem/dune-fufem.git
- - duneci-install-module https://gitlab.mn.tu-dresden.de/ag-sander/dune/dune-elasticity.git
- duneci-install-module https://gitlab.mn.tu-dresden.de/iwr/dune-gmsh4
+# Tests with the 2.9 release. That's the one in Debian bookworm
+#--------------------------------------------------------------------
dune:2.9 gcc:
variables:
DUNECI_BRANCH: releases/2.9
@@ -18,6 +19,18 @@ dune:2.9 gcc:
- *before
script: duneci-standard-test
+dune:2.9 dune-elasticity gcc:
+ variables:
+ DUNECI_BRANCH: releases/2.9
+ image: registry.dune-project.org/docker/ci/dune:2.9-debian-11-gcc-10-20
+ before_script:
+ - *before
+ - duneci-install-module https://gitlab.mn.tu-dresden.de/ag-sander/dune/dune-elasticity.git
+ script: duneci-standard-test
+
+# Tests with the git master branch
+# Some, but not all optional dependencies are made available.
+#------------------------------------------------------------------
dune:git gcc-10 C++20:
image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
before_script:
@@ -30,7 +43,25 @@ dune:git clang-11 C++20:
- *before
script: duneci-standard-test
-dune:git dune-parmg dune-curvedgeometry dune-curvedgrid dune-foamgrid gcc-10 C++20:
+dune:git dune-elasticity gcc-10 C++20:
+ image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
+ before_script:
+ - *before
+ - duneci-install-module https://gitlab.mn.tu-dresden.de/ag-sander/dune/dune-elasticity.git
+ script: duneci-standard-test
+
+dune:git dune-curvedgrid dune-foamgrid gcc-10 C++20:
+ image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
+ before_script:
+ - *before
+ - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-curvedgeometry.git
+ - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/iwr/dune-curvedgrid.git
+ - duneci-install-module https://gitlab.dune-project.org/extensions/dune-foamgrid.git
+ script: duneci-standard-test
+
+# Tests with all optional dependencies
+#-------------------------------------------
+dune:git dune-parmg dune-curvedgrid dune-foamgrid dune-elasticity gcc-10 C++20:
image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
before_script:
- *before
@@ -38,9 +69,10 @@ dune:git dune-parmg dune-curvedgeometry dune-curvedgrid dune-foamgrid gcc-10 C++
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-curvedgeometry.git
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/iwr/dune-curvedgrid.git
- duneci-install-module https://gitlab.dune-project.org/extensions/dune-foamgrid.git
+ - duneci-install-module https://gitlab.mn.tu-dresden.de/ag-sander/dune/dune-elasticity.git
script: duneci-standard-test
-dune:git dune-parmg dune-curvedgeometry dune-curvedgrid dune-foamgrid clang-11 C++20:
+dune:git dune-parmg dune-curvedgrid dune-foamgrid dune-elasticity clang-11 C++20:
image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-11-20
before_script:
- *before
@@ -48,6 +80,7 @@ dune:git dune-parmg dune-curvedgeometry dune-curvedgrid dune-foamgrid clang-11 C
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-curvedgeometry.git
- duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/iwr/dune-curvedgrid.git
- duneci-install-module https://gitlab.dune-project.org/extensions/dune-foamgrid.git
+ - duneci-install-module https://gitlab.mn.tu-dresden.de/ag-sander/dune/dune-elasticity.git
script: duneci-standard-test
# Check for spelling mistakes in text