Release 15.2
15-2-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 checkout upstream/master
git pull upstream master
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 15-2-stable-ee
was cut frommaster
.$ git show `git merge-base upstream/15-2-stable-ee upstream/master` commit ec57b30ca1885598a0f65f8ebe18b5e3a3bc508f Merge: 0a72786c30b0 88787a721258 Author: charlie ablett <cablett@gitlab.com> Date: Wed Jul 20 15:44:59 2022 Merge branch 'sh-fix-move-deploy-keys-fips' into 'master' Fix move deploy keys during project imports in FIPS mode See merge request gitlab-org/gitlab!92809
-
Get the latest JH merge commit or Update jh/Gemfile.lock
commit until the commitec57b30ca1885598a0f65f8ebe18b5e3a3bc508f
.$ git log --show-pulls --until "Wed Jul 20 15:44:59 2022" main-jh -- jh commit f705227d3cb55867d79f21686b505d69ec19ba58 Merge: b07e4709d0d6 a06f34733f27 Author: Dave Liu <daveliu@jihulab.com> Date: Wed Jul 20 15:01:28 2022 Merge branch 'rollback-registraton-page-password-validation' into 'main-jh' Rollback password validation feature on registration page See merge request gitlab-cn/gitlab!707
-
Create 15-2-stable-jh
from the commitf705227d3cb55867d79f21686b505d69ec19ba58
.git branch 15-2-stable-jh f705227d3cb55867d79f21686b505d69ec19ba58
-
Merge 15-2-stable-ee
to15-2-stable-jh
.git checkout 15-2-stable-jh
git merge upstream/15-2-stable-ee
-
Review JH changes between 15-2-stable-ee
and15-2-stable-jh
.git diff upstream/15-2-stable-ee..15-2-stable-jh > jh-stable.patch
-
diff jh-stable.patch jh.patch
# => This should only contain the code diff of the JH commits merged afterf705227d3cb55867d79f21686b505d69ec19ba58
onmain-jh
, i.e. the following commits and their code diff:$ git rev-list --no-merges f705227d3cb55867d79f21686b505d69ec19ba58..main-jh -- jh a5661672b919164eedded896c0b418fcab3fdd50 c53eedb77872cfe408a53fc81fd7c25a91b1d30e cfb60a9ef4405f82331815c52b53c77f0dc32812 aaf2969c43ae93e13f93e4f9deb9662ae773777f 21a2241b4e26dd928c2bf522705642075f0d1820 05e47229631e9a64d2a3f849dcf7f6a9213af372 f85d8a41b93750e01b219e432c35556a0711683f $ git diff f705227d3cb55867d79f21686b505d69ec19ba58..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 15-2-stable-jh
to remote.git push --set-upstream origin 15-2-stable-jh
-
15-2-stable-jh
can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/15-2-stable-jh.
-
Monitor the pipeline of 15-2-stable-jh
and make sure it can pass.
v15.2.0-ee
is created
After the EE release tag -
Merge the EE release tag to make sure we have all the commits. git checkout 15-2-stable-jh
git merge v15.2.0-ee
-
Update VERSION
to15.2.0-jh
.echo -n 15.2.0-jh > VERSION
git commit -a -m "Update VERSION to 15.2.0-jh"
-
Tag v15.2.0-jh
from15-2-stable-jh
.git tag v15.2.0-jh -m "Version v15.2.0-jh"
-
Push the branch 15-2-stable-jh
and the tagv15.2.0-jh
git checkout 15-2-stable-jh
git push
git push origin v15.2.0-jh
-
v15.1.0-jh
can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/v15.2.0-jh
-
Monitor the pipeline of v15.2.0-jh
and make sure it can pass.