Release 15.1.4 for JH

Steps

  • Run git pull so that we can see the tag v15.1.4-ee.
  • Merge v15.1.4-ee into 15-1-stable-jh
    • git checkout 15-1-stable-jh
    • git merge v15.1.4-ee
      • A conflict will happen in VERSION, set it to 15.1.4-jh and commit the change.
  • 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 this step generates changes to the jh/Gemfile.lock file, commit the changes with the commit message Update jh/Gemfile.lock.
  • Tag v15.1.4-jh
    • git checkout 15-1-stable-jh
    • git tag -a v15.1.4-jh -m "Version v15.1.4-jh"
  • Review JH changes between v15.1.4-ee..v15.1.4-jh and v15.1.3-ee..v15.1.3-jh which should only contains the version change, the above JH and upstream commit changes and the jh/Gemfile.lock changes (if any).
    • git fetch --tags --all （if your local tag is not latest code）
    • git diff v15.1.3-ee..v15.1.3-jh > jh_diff.3
    • git diff v15.1.4-ee..v15.1.4-jh > jh_diff.4
    • diff jh_diff.3 jh_diff.4: 
      2c2
< index 669844596b5..27cb96b1643 100644
---
> index 3c699452287..71cfc2c5ae3 100644
6c6
< -15.1.3-ee
---
> -15.1.4-ee
8c8
< +15.1.3-jh
---
> +15.1.4-jh
745c745
< index 00000000000..d785a15c579
---
> index 00000000000..6ae1c3c9f3a
2520c2520
< +   2.3.6
---
> +   2.3.15
  • Push the branch 15-1-stable-jh and the tag v15.1.4-jh.
  • Monitor the pipeline of v15.1.4-jh and make sure it can pass.