... | ... | @@ -2,7 +2,7 @@ |
|
|
|
|
|
__Authors__: C. Grüninger (2.1), T. Fetzer (2.3), A. Kissinger (2.4), K. Weishaupt (2.9), J. Hommel (2.10), S. Ackermann (2.11), K. Heck (3.1), E. Coltman (3.2), K. Weishaupt (3.3), H. Wu (3.4), Y. Wang (3.5), M. Kelm (3.6), H. Oukili (3.7)
|
|
|
|
|
|
Most Recent Release: [DuMu<sup>x</sup> 3.7](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/tags/3.7.0) , 2023-03-31
|
|
|
Most Recent Release: [DuMu<sup>x</sup> 3.7](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/tags/3.7.0) , 2023-04-26
|
|
|
|
|
|
## Introduction
|
|
|
|
... | ... | @@ -109,11 +109,11 @@ in the DuMu<sup>x</sup> -stable top folder. Use what the script recommends to ad |
|
|
* __Run create_cmakelists__: Run the `bin/create_cmakelists.py` script in `dumux/dumux`, in order
|
|
|
to update the cmakelists in the source directory.
|
|
|
|
|
|
* __Release Branches: For each DuMu<sup>x</sup> module, create a new branch titled releases/X.Y.__ (e.g., [DuMu<sup>x</sup> 3.4](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/tree/releases/3.4), [DuMu<sup>x</sup>-Lecture 3.4](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-lecture/-/tree/releases/3.4), [DuMu<sup>x</sup>-Course 3.4](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/-/tree/releases/3.4)
|
|
|
* __Release Branches: For each DuMu<sup>x</sup> module, create a new branch titled releases/X.Y.__ (e.g., [DuMu<sup>x</sup> 3.7](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux/-/tree/releases/3.7), [DuMu<sup>x</sup>-Lecture 3.7](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-lecture/-/tree/releases/3.7), [DuMu<sup>x</sup>-Course 3.7](https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/-/tree/releases/3.7)
|
|
|
|
|
|
-Create new branch: `git checkout -b releases/X.Y`
|
|
|
-Create new branch: create protected branches using the web interface and API.
|
|
|
|
|
|
- Modify the versions required in dune.module (for example ”Version: 3.4-git” to ”Version: 3.5-
|
|
|
- Modify the versions required in dune.module (for example ”Version: 3.7-git” to ”Version: 3.8-
|
|
|
git”) and commit the change. Push the branch:
|
|
|
`git push origin releases/X.Y`
|
|
|
__From then on__, changes are still to be made to the master, but the merge commits should be
|
... | ... | |