Release 14.10.3 for JH
Steps
-
Run git pullso that we can see the tagv14.10.3-ee. -
Merge v14.10.3-eeinto14-10-stable-jhgit checkout 14-10-stable-jh-
git merge v14.10.3-ee- A conflict will happen in
VERSION, set it to14.10.3-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.10.3-jhgit checkout 14-10-stable-jhgit tag -a v14.10.3-jh -m "Version v14.10.3-jh"
-
Review JH changes between v14.10.3-ee..v14.10.3-jhandv14.10.2-ee..v14.10.2-jhwhich should only contains the version change, the above JH and upstream commit changes and thejh/Gemfile.lockchanges (if any).-
git fetch --tags --all(if your local tag is not latest code) git diff v14.10.2-ee..v14.10.2-jh > jh_diff.2git diff v14.10.3-ee..v14.10.3-jh > jh_diff.3-
diff jh_diff.2 jh_diff.3:2c2 < index b26b730ae1e..7129b157bf3 100644 --- > index 2b3a0af3562..e53e472492a 100644 6c6 < -14.10.2-ee --- > -14.10.3-ee 8c8 < +14.10.2-jh --- > +14.10.3-jh
-
-
Push the branch 14-10-stable-jhand the tagv14.10.3-jh.git checkout 14-10-stable-jhgit pushgit push origin v14.10.3-jh-
v14.10.3-jhcan now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/v14.10.3-jh
-
Monitor the pipeline of v14.10.3-jhand make sure it can pass.
由 Dave Liu(Wenju) 编辑于