| ... | ... | @@ -118,7 +118,7 @@ git”) and commit the change. Push the branch: |
|
|
|
__From then on__, changes are still to be made to the master, but the merge commits should be
|
|
|
|
cherrypicked onto the releases/X.Y branch.
|
|
|
|
|
|
|
|
* __CI:__ Reconfigure [the CI](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/pipelines) to test both master and the release branch with the planned configurations. Continue to check the CI for failing automatic tests. (Adapt this [file](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-docker-ci/-/blob/master/.gitlab-ci.yml).)
|
|
|
|
* __CI:__ Reconfigure [the CI](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/pipelines) to test both master and the release branch with the planned configurations. Continue to check the CI for failing automatic tests. In case you need to update or change the generated docker images, this can be done in [this file](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-docker-ci/-/blob/master/.gitlab-ci.yml). The `dumux-docker-ci` repository contains the docker files for the images and its CI builds those images as well as uploads them to the image registry. Additionally, update the [scheduled pipelines](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/pipeline_schedules) to test your and the previous release branch as well as the master branch (keep that). If the DuMu<sup>x</sup> pipelines should be run with other docker images, adapt [this file](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/blob/master/.gitlab-ci.yml).
|
|
|
|
|
|
|
|
* __Local Testing:__
|
|
|
|
-`dune` __versions__: Set up a DuMu<sup>x</sup> environment with each of the dune environments DuMu<sup>x</sup> will
|
| ... | ... | |
