Release 14.9
14-9-stable-ee
is created
After the EE stable branch -
Update
main-jh
with the latestmaster
again.git checkout main-jh
git pull
git fetch upstream
git merge upstream/master
git push
-
Review JH changes between
master
andmain-jh
.git diff upstream/master..main-jh > jh.patch
-
Get the commit where
14-9-stable-ee
was cut frommaster
.$ git show `git merge-base upstream/14-9-stable-ee upstream/master` commit 2596f9524a5abdf5c668fa941803299d9332b97a Merge: 1f55fa41dff a2113aff32b Author: Ezekiel Kigbo <ekigbo@gitlab.com> Date: Fri Mar 18 15:59:28 2022 Merge branch 'update-iterations-form-pajamas' into 'master' Update new iterations form to match pajamas specs See merge request gitlab-org/gitlab!82210
-
Get the latest JH merge commit or
Update jh/Gemfile.lock
commit until the commit2596f9524a5abdf5c668fa941803299d9332b97a
.$ git log --show-pulls --until "Fri Mar 18 15:59:28 2022" main-jh -- jh commit b281dd5ac549f336e24c3275cc51444b0284e9e5 Merge: cd4a1df837c 76573f16093 Author: Jeremy Wu <jeremyw@jihulab.com> Date: Fri Mar 18 15:45:23 2022 Merge branch '779-doc-update-frontend-test-guideline-documentation' into 'main-jh' Update frontend_testing documentation Closes #779 See merge request gitlab-cn/gitlab!376
-
Create
14-9-stable-jh
from the commitb281dd5ac549f336e24c3275cc51444b0284e9e5
.git branch 14-9-stable-jh b281dd5ac549f336e24c3275cc51444b0284e9e5
-
Merge
14-9-stable-ee
to14-9-stable-jh
.git checkout 14-9-stable-jh
git merge upstream/14-9-stable-ee
-
Review JH changes between
14-9-stable-ee
and14-9-stable-jh
.git diff upstream/14-9-stable-ee..14-9-stable-jh > jh-stable.patch
-
diff jh-stable.patch jh.patch
# => This should only contain the code diff of the JH commits merged afterb281dd5ac549f336e24c3275cc51444b0284e9e5
onmain-jh
, i.e. the following commits and their code diff:$ git rev-list --no-merges b281dd5ac549f336e24c3275cc51444b0284e9e5..main-jh -- jh 232ba0cb3119a14c372ea2cc92618ee000ee10d4 98a0a07a9538e40f1b712cfe16364b195479e519 $ git diff b281dd5ac549f336e24c3275cc51444b0284e9e5..main-jh -- jh
-
Update the
jh/Gemfile.lock
file:-
bundle config set --local gemfile jh/Gemfile
(if you didn't point Gemfile to jh/Gemfile before) cp Gemfile.lock jh/ && bundle install
- If the above step generates changes to the
jh/Gemfile.lock
file, commit the changes with the commit messageUpdate jh/Gemfile.lock
.
-
-
Push
14-9-stable-jh
to remote.git push --set-upstream origin 14-9-stable-jh
-
14-9-stable-jh
can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/14-9-stable-jh.
-
Monitor the pipeline of
14-9-stable-jh
and make sure it can pass.
v14.9.0-ee
is created
After the EE release tag -
Merge the EE release tag to make sure we have all the commits.
git checkout 14-9-stable-jh
git merge v14.9.0-ee
-
Update
VERSION
to14.9.0-jh
.echo -n 14.9.0-jh > VERSION
git commit -a -m "Update VERSION to 14.9.0-jh"
-
Tag
v14.9.0-jh
from14-9-stable-jh
.git tag v14.9.0-jh -m "Version v14.9.0-jh"
-
Push the branch
14-9-stable-jh
and the tagv14.9.0-jh
git checkout 14-9-stable-jh
git push
git push origin v14.9.0-jh
-
v14.9.0-jh
can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/v14.9.0-jh
-
Monitor the pipeline of
v14.9.0-jh
and make sure it can pass.