-
Notifications
You must be signed in to change notification settings - Fork 90
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Release 1.9.0 Checklist #1738
Comments
This issue is also meant to become a new template which we will use for following releases. |
This release approach contains some changes to the previous releases, especially how I think in earlier releases all commits after the last release where cherry-picked onto master with an additional merge commit. Although I'm not entirely sure about that. The point is however that the I think this should change, and the release PR should just be a normal merge from gitGraph TB:
commit
branch develop
checkout develop
commit
branch feature
checkout feature
commit
commit
checkout develop
merge feature
checkout feature
commit
commit
checkout develop
merge feature
checkout main
merge develop tag: "vX.Y.Z"
checkout feature
commit
commit
checkout develop
merge feature
checkout feature
commit
commit
checkout develop
merge feature
checkout main
merge develop tag: "vX'.Y'.Z'"
|
We should also add Conan to the package managers, even though we don't really do much work there. On the release workflow, I want to propose a slight change: If we introduce the "Change version tag in CMakeLists.txt to main" change into |
I guess the question is if we want to have an extra merge commit on main to denote the release. I think we can use your approach either way, and I would also prefer it. |
are the vcpkg and conan contributed by us? |
For merging to master, I assume you will not change the version tag as master from the beginning. |
For master, I initially thought I would just cherry pick all commits from develop into master. But squashing all the commits might be the better choice. I don't really care how the history of master will look like in the future, I just want to have the latest changes in it. |
BTW you can see how the history of the main branch should look like at: https://github.com/MarcelKoch/ginkgo/tree/main-with-merges. This example has two merges from develop into the main branch to "simulate" our release process. |
It will also be great if you can link the step to the pr such that we might be able to see more detail on that. |
Pre Release / Prerequisites
Step-by-Step
develop
branchCMakeLists.txt
tomain
(PR-tag)check-latest
spack-ci
develop
intomain
, with merge commit (i.e.--no--ff
)vX.Y.Z
onmain
Post Release
develop
for next release (Prepare Develop for 1.10 Release #1747 )develop
X.Y+1.0
master-release/X.Y.Z
frommain
master
master
(Master release/1.9.0 #1748)The text was updated successfully, but these errors were encountered: