Various CI updates

.gitlab-ci.yml

@@ -9,26 +9,6 @@ before_script: &before
   - 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
 
-# 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
-    diff --git a/dune/common/densematrix.hh b/dune/common/densematrix.hh
-    index b03bbb0b..917ecef9 100644
-    --- a/dune/common/densematrix.hh
-    +++ b/dune/common/densematrix.hh
-    @@ -897,7 +897,7 @@ namespace Dune
-             for (size_type k=i+1; k<A.rows(); k++)
-             {
-               auto abs = fvmeta::absreal(A[k][i]);
-    -          auto mask = abs > pivmax;
-    +          bool mask = abs > pivmax;
-               pivmax = Simd::cond(mask, abs, pivmax);
-               imax   = Simd::cond(mask, simd_index_type(k), imax);
-             }
-    EOT
-
 dune:2.9 gcc:
   variables:
     DUNECI_BRANCH: releases/2.9
@@ -37,24 +17,21 @@ dune:2.9 gcc:
   - *before
   script: duneci-standard-test
 
-dune:git gcc:
-  image: registry.dune-project.org/docker/ci/dune:git-debian-10-gcc-8-17
+dune:git gcc-10 C++20:
+  image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
   before_script:
-  - *patch-dune-common
   - *before
   script: duneci-standard-test
 
-dune:git clang:
-  image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-20
+dune:git clang-11 C++20:
+  image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-11-20
   before_script:
-  - *patch-dune-common
   - *before
   script: duneci-standard-test
 
-dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid gcc:
-  image: registry.dune-project.org/docker/ci/dune:git-debian-10-gcc-8-17
+dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid gcc-10 C++20:
+  image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
   before_script:
-  - *patch-dune-common
   - *before
   - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/paraphase/dune-parmg.git
   - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-vtk.git
@@ -63,10 +40,9 @@ dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid g
   - duneci-install-module https://gitlab.dune-project.org/extensions/dune-foamgrid.git
   script: duneci-standard-test
 
-dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid clang:
-  image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-20
+dune:git dune-parmg dune-vtk dune-curvedgeometry dune-curvedgrid dune-foamgrid clang-11 C++20:
+  image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-11-20
   before_script:
-  - *patch-dune-common
   - *before
   - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/paraphase/dune-parmg.git
   - duneci-install-module https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.mn.tu-dresden.de/spraetor/dune-vtk.git