Bump to v1.6.0rc2

[forsyth2]

Bump to v1.6.0rc2

[forsyth2]

We don't actually merge this PR, because we want to test this RC in the next Unified RC before actually merging it to include officially. We just need this PR's branch.

[forsyth2]

Note: we actually can't use this exact branch name because it collides with the tag name.

[xylar]

Yes, please delete the branch before you push the tag.

[forsyth2]

Release process notes:

• 1.5.0rc1 PR: Bump to 1.5.0rc1
  
• 1.5.0 production release PR: Bump to 1.5.0
  
• 1.6.0rc1 PR: Bump to 1.6.0rc1
  
• Releases: https://github.com/E3SM-Project/zstash/releases

Step 1: setup/testing

Skipping because we did partial testing on #440 and furthermore, we need to actually test that PR in the Unified environment to know if it worked.

Step 2: Bump versions

Step 2a: Confluence

Already updated, when we made 1.6.0rc1

Step 2b: zstash repo

cd ~/ez/zstash
git status
# On branch isolate-hsi-calls
# nothing to commit, working tree clean

# IMPORTANT: Base off of #440's branch
git fetch xylar isolate-hsi-calls
git checkout -b v1.6.0rc2 xylar/isolate-hsi-calls
tbump 1.6.0rc2 --no-tag
git diff HEAD^ HEAD | cat
# Yes, these match up with changes in https://github.com/E3SM-Project/zstash/pull/438
git push upstream v1.6.0rc2
# Created https://github.com/E3SM-Project/zstash/pull/441
# But we don't actually need it.
# We just need its branch v1.6.0rc2
git tag v1.6.0rc2
git push upstream v1.6.0rc2
# The branch has a name that collides with the tag!
# (In the usual procedure, we checkout a reset main branch and delete this branch)

# Rename the branch here
git branch -m update-to-1.6.0rc2
# And delete the `v1.6.0rc2` branch on GitHub too!
# https://github.com/E3SM-Project/zstash/branches

# Let's try again. The tag was successful, so we just need to push to upstream
git push upstream v1.6.0rc2
# Successful this time

v1.6.0rc2 now appears on Tags but not on Releases. Good, this is expected.

Step 2c: zstash-feedstock repo

cd /global/homes/f/forsyth/zstash-feedstock
curl -sL https://github.com/E3SM-Project/zstash/archive/v1.6.0rc2.tar.gz | openssl sha256
# SHA2-256(stdin)= b78dea5fc2d771cec2441de21c0e8d5137d2f4689633c7795ad201f80bfc9a31
git status # Check for uncommitted changes
git fetch upstream dev
git checkout -b v1.6.0rc2 upstream/dev
emacs recipe/meta.yaml
# In `recipe/meta.yaml`, update the version and sha256 (and the build number if needed):
# {% set version = "1.6.0rc2" %}
# sha256: ... # The sha256 from the previous step
# number: 0 # build >>> number should always be 0

# From https://github.com/conda-forge/zppy-interfaces-feedstock/pull/5#pullrequestreview-3351366258:
# Please always check the diff between the tag you're making a package for and the previous one. Please look for changes e.g. in dev.yml

# Review:
# https://github.com/E3SM-Project/zstash/compare/v1.6.0rc1...v1.6.0rc2
# So, it looks like there's nothing to change then.

git add -A
git commit -m "v1.6.0rc2"
git push forsyth2 v1.6.0rc2

Created conda-forge/zstash-feedstock#26 (accidentally set merge branch to be main, but this was easily switched to the correct branch: dev)

[xylar]

Looks good.