Skip to content
代码片段 群组 项目
New look: 关闭

Release 14.2 for JH

    • 已关闭 议题 由 Qian Zhang (Gary) @qianzhangxa 创建于

    After the EE stable branch 14-2-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 14-2-stable-ee was cut from master. 
      $ git show `git merge-base upstream/14-2-stable-ee upstream/master`
commit a14946fdb3ca54681ef38c307719fb633f3aab21
Merge: 6791a6bffe0 99acb6ae98f
Author: Stan Hu <stanhu@gmail.com>
Date:   Thu Aug 19 10:25:59 2021

  Merge branch '338729-use-upsert-for-storing-mentions' into 'master'
  
  Use UPSERT when storing user mentions
  
  See merge request gitlab-org/gitlab!68433
    • Get the latest JH merge commit until the commit a14946fdb3ca54681ef38c307719fb633f3aab21. 
      $ git log --show-pulls --until "Thu Aug 19 10:25:59 2021" main-jh -- jh
commit e74056e6b744ccaa2e0169b3a0c93e31883678bf
Author: Qian Zhang <zhq527725@gmail.com>
Date:   Tue Aug 17 17:21:03 2021

  Merge branch 'fix-ci-template' into 'main-jh'
  
  add missing templates
  
  See merge request gitlab-jh/gitlab!75
    • Create 14-2-stable-jh from the commit e74056e6b744ccaa2e0169b3a0c93e31883678bf.
      • git branch 14-2-stable-jh e74056e6b744ccaa2e0169b3a0c93e31883678bf
    • Merge 14-2-stable-ee to 14-2-stable-jh.
      • git checkout 14-2-stable-jh
      • git merge upstream/14-2-stable-ee
    • Review JH changes between 14-2-stable-ee and 14-2-stable-jh.
      • git diff upstream/14-2-stable-ee..14-2-stable-jh > jh-stable.patch
      • diff jh.patch jh-stable.patch # => This diff is empty since there is no commits merged for the jh/ folder after a14946fdb3ca54681ef38c307719fb633f3aab21.
    • Push 14-2-stable-jh to remote.
      • git push --set-upstream origin 14-2-stable-jh
    • 14-2-stable-jh can now be found at https://gitlab.com/gitlab-jh/gitlab/-/commits/14-2-stable-jh.

    After the EE release tag v14.2.0-ee is created

    • Merge the EE release tag to make sure we have all the commits.
      • git checkout 14-2-stable-jh
      • git merge v14.2.0-ee
    • Update VERSION to 14.2.0-jh.
      • echo -n 14.2.0-jh > VERSION
      • git commit -a -m "Update VERSION to 14.2.0-jh"
    • Tag v14.2.0-jh from 14-2-stable-jh.
      • git tag v14.2.0-jh -m "Version v14.2.0-jh"
    • Push the branch 14-2-stable-jh and the tag v14.2.0-jh
      • git checkout 14-2-stable-jh
      • git push
      • git push origin v14.2.0-jh
    • v14.2.0-jh can now be found at https://gitlab.com/gitlab-jh/gitlab/-/commits/v14.2.0-jh
    ✓ 12/12 检查清单项已完成 · 编辑于

    设计

      子项 ...

      2. 动态

      请注册或登录再回复