Release 14.7.6 for JH
Steps
-
Run git pullso that we can see the tagv14.7.6-ee. -
Merge v14.7.6-eeinto14-7-stable-jhgit checkout 14-7-stable-jh-
git merge v14.7.6-ee- A conflict will happen in
VERSION, set it to14.7.6-jhand commit the change.
- A conflict will happen in
-
Update the jh/Gemfile.lockfile:-
bundle config set --local gemfile jh/Gemfile(if you didn't point Gemfile to jh/Gemfile before) -
cp Gemfile.lock jh/ && bundle install- If this step generates changes to the
jh/Gemfile.lockfile, commit the changes with the commit messageUpdate jh/Gemfile.lock.
- If this step generates changes to the
-
-
Tag v14.7.6-jhgit checkout 14-7-stable-jhgit tag -a v14.7.6-jh -m "Version v14.7.6-jh"
-
Review JH changes between v14.7.6-ee..v14.7.6-jhandv14.7.4-ee..v14.7.4-jhwhich should only contains the version change and thejh/Gemfile.lockchanges (if any).git diff v14.7.5-ee..v14.7.5-jh > jh_diff.5git diff v14.7.6-ee..v14.7.6-jh > jh_diff.6-
diff jh_diff.5 jh_diff.6:2c2 < index 85018157369..62cbdef8b5e 100644 --- > index 6b7a4a5d42f..85d94b3bcc7 100644 6c6 < -14.7.5-ee --- > -14.7.6-ee 8c8 < +14.7.5-jh --- > +14.7.6-jh
-
Push the branch 14-7-stable-jhand the tagv14.7.6-jh.git checkout 14-7-stable-jhgit pushgit push origin v14.7.6-jh-
v14.7.6-jhcan now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/v14.7.6-jh
-
Monitor the pipeline of v14.7.6-jhand make sure it can pass.