diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d1094ba047c9d682ce6fc31d6b0406b6b7cd897..0bca1de73afae78b2c84564f393f7e65ea0a63e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,9 @@ --- # Install external dependencies before_script: - - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-matrix-vector.git + - duneci-install-module https://gitlab.dune-project.org/fufem/dune-matrix-vector.git +# The 2.9 release is the one in Debian 12 ('bookworm', 'stable' at the time of writing) dune:2.9 debian-11 gcc-10 C++20: variables: DUNECI_BRANCH: releases/2.9 @@ -10,8 +11,22 @@ dune:2.9 debian-11 gcc-10 C++20: before_script: script: duneci-standard-test -dune:git ubuntu-20-04 clang-10 C++17: - image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-17 +# The 2.10 release is the one in Debian 13 ('trixie', 'testing' at the time of writing) +dune:2.10 debian-11 clang-13 C++20: + variables: + DUNECI_BRANCH: releases/2.10 + image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-13-20 + script: duneci-standard-test + +dune:2.10 debian-11 gcc-10 C++20: + variables: + DUNECI_BRANCH: releases/2.10 + image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20 + script: duneci-standard-test + +# Also test with the current development branch +dune:git debian-11 clang-13 C++20: + image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-13-20 script: duneci-standard-test dune:git debian-11 gcc-10 C++20: diff --git a/CHANGELOG.md b/CHANGELOG.md index e78979cb71d50476e4a360a63e757060c03087d5..899e240a8119c04b23799e082cf3fe9a5e03eb53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ -# Master (will become release 2.10) +# Master (will become release 2.11) + +- ... + +# Release 2.10 - Deprecate the file `tuplevector.hh`. An equivalent file exists in `dune-common` since 2016. Please use that from now on. diff --git a/dune.module b/dune.module index de9778fa647218e7d046c2d715dc25ccee555739..a7502361b0d2ddd6a36dfc0e8640a77161c41ba7 100644 --- a/dune.module +++ b/dune.module @@ -4,7 +4,7 @@ #Name of the module Module: dune-solvers -Version: 2.10-git +Version: 2.11-git Maintainer: oliver.sander@tu-dresden.de #depending on Depends: dune-common dune-grid dune-istl dune-localfunctions dune-matrix-vector