Release 15.0

After the EE stable branch 15-0-stable-ee is created

• Update main-jh with the latest master again.
  • git checkout main-jh
  • git pull
  • git fetch upstream
  • git merge upstream/master
  • git push
• Review JH changes between master and main-jh.
  • git diff upstream/master..main-jh > jh.patch
• Get the commit where 15-0-stable-ee was cut from master.

  $ git show `git merge-base upstream/15-0-stable-ee upstream/master`
  commit a81a1e8bf2e8d71bf20cd23b22d94d4225ea4310
  Merge: dd91cadc011 531a3c54ed9
  Author: Alessio Caiazza <acaiazza@gitlab.com>
  Date:   Wed May 18 15:47:27 2022 +0000
  
    Merge branch 'release-tools/update-gitaly' into 'master'
  
    Update Gitaly version
  
    See merge request gitlab-org/gitlab!87897
  

• Get the latest JH merge commit or Update jh/Gemfile.lock commit until the commit a81a1e8bf2e8d71bf20cd23b22d94d4225ea4310.

  $ git log --show-pulls --until "Wed May 18 15:47:27 2022 +0000" main-jh -- jh
  commit 17edd5c05fe0cdd2e913b057cf9a43dba29fa463
  Author: Fu Zhang <fuzhang@jihulab.com>
  Date:   Wed May 18 19:31:08 2022
  
    Merge branch 'bump-ipynbdiff' into 'main-jh'
    
    Bump ipynbdiff version to 0.4.7
    
    See merge request gitlab-cn/gitlab!511

• Create 15-0-stable-jh from the commit 17edd5c05fe0cdd2e913b057cf9a43dba29fa463.
  • git branch 15-0-stable-jh 17edd5c05fe0cdd2e913b057cf9a43dba29fa463
• Merge 15-0-stable-ee to 15-0-stable-jh.
  • git checkout 15-0-stable-jh
  • git merge upstream/15-0-stable-ee
• Review JH changes between 15-0-stable-ee and 15-0-stable-jh.
  • git diff upstream/15-0-stable-ee..15-0-stable-jh > jh-stable.patch
  • diff jh-stable.patch jh.patch # => This should only contain the code diff of the JH commits merged after 17edd5c05fe0cdd2e913b057cf9a43dba29fa463 on main-jh, i.e. the following commits and their code diff:

    $ git rev-list --no-merges 17edd5c05fe0cdd2e913b057cf9a43dba29fa463..main-jh -- jh
    8834a43a6f4cb7fd6a68ae26232cf12b5b2a23f4
    e3ece3e851b393c9b7f3f9d0023ea24a07d80bc3
    fdb2601a98cdebb423628947c2434580f680867e
    0b4e6a6be0b06929e06eec22f9f13f3bb332a0ea
    76dbfadb1aedc80fbdd3a481239be562a430ae5c
    b2670e9928f85fd3f2fb0184fa673997d6bd5df3
    
    $ git diff 17edd5c05fe0cdd2e913b057cf9a43dba29fa463..main-jh -- jh

• Cherry pick the following JH commits to 15-0-stable-jh since we need them in this release. Please note they are the merge commits in the related MRs, so we need to cherry pick them with the -m1 option, and these commits should be cherry picked in the same order as when the related MRs were merged (otherwise there may be code conflicts during cherry-pick). If any of these commits depends on an upstream commit which is not in 15-0-stable-ee, we need to cherry pick such upstream commit first.
• 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 message Update jh/Gemfile.lock.
• Push 15-0-stable-jh to remote.
  • git push --set-upstream origin 15-0-stable-jh
  • 15-0-stable-jh can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/15-0-stable-jh.
• Monitor the pipeline of 15-0-stable-jh and make sure it can pass.

After the EE release tag v15.0.0-ee is created

• Merge the EE release tag to make sure we have all the commits.
  • git checkout 15-0-stable-jh
  • git merge v15.0.0-ee
• Update VERSION to 15.0.0-jh.
  • echo -n 15.0.0-jh > VERSION
  • git commit -a -m "Update VERSION to 15.0.0-jh"
• Tag v15.0.0-jh from 15-0-stable-jh.
  • git tag v15.0.0-jh -m "Version v15.0.0-jh"
• Push the branch 15-0-stable-jh and the tag v15.0.0-jh
  • git checkout 15-0-stable-jh
  • git push
  • git push origin v15.0.0-jh
  • v15.0.0-jh can now be found at https://jihulab.com/gitlab-cn/gitlab/-/commits/v15.0.0-jh
• Monitor the pipeline of v15.0.0-jh and make sure it can pass.