Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-solvers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
agnumpde
dune-solvers
Commits
3c7573d3
Commit
3c7573d3
authored
4 months ago
by
oliver.sander_at_tu-dresden.de
Browse files
Options
Downloads
Plain Diff
Merge branch 'increase-version-to-2.11-git' into 'master'
Set version to 2.11-git See merge request
!78
parents
88506ede
2bd15066
No related branches found
No related tags found
1 merge request
!78
Set version to 2.11-git
Pipeline
#64964
passed
4 months ago
Stage: .pre
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+18
-3
18 additions, 3 deletions
.gitlab-ci.yml
CHANGELOG.md
+5
-1
5 additions, 1 deletion
CHANGELOG.md
dune.module
+1
-1
1 addition, 1 deletion
dune.module
with
24 additions
and
5 deletions
.gitlab-ci.yml
+
18
−
3
View file @
3c7573d3
---
# Install external dependencies
before_script
:
-
duneci-install-module https://git
.imp.fu-berlin.de/agnumpde
/dune-matrix-vector.git
-
duneci-install-module https://git
lab.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
:
...
...
This diff is collapsed.
Click to expand it.
CHANGELOG.md
+
5
−
1
View file @
3c7573d3
# 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.
...
...
This diff is collapsed.
Click to expand it.
dune.module
+
1
−
1
View file @
3c7573d3
...
...
@@ -4,7 +4,7 @@
#Name of the module
Module
:
dune
-
solvers
Version
:
2.1
0
-
git
Version
:
2.1
1
-
git
Maintainer
:
oliver
.
sander
@
tu
-
dresden
.
de
#depending on
Depends
:
dune
-
common
dune
-
grid
dune
-
istl
dune
-
localfunctions
dune
-
matrix
-
vector
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment