From 00c3e971b12b1ebbf1d610af5fe86d7767641d4e Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Thu, 3 Aug 2023 18:14:07 -0400 Subject: [PATCH] ci: update release instructions --- .github/ISSUE_TEMPLATE/new_release.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/new_release.md b/.github/ISSUE_TEMPLATE/new_release.md index 1406f04e30..a60870a8a8 100644 --- a/.github/ISSUE_TEMPLATE/new_release.md +++ b/.github/ISSUE_TEMPLATE/new_release.md @@ -44,10 +44,27 @@ git push git fetch origin git checkout -b release_@MAJOR@@MINOR@ origin/master # Use the following command with care -git push origin +git push origin release_@MAJOR@@MINOR@:release_@MAJOR@@MINOR@ ``` -- [ ] Create PR that merges release_@MAJOR@@MINOR@ into master +- [ ] Remove older patch releases for @MAJOR@.@MINOR@.X in ReadTheDocs. +- [ ] Create merge -sours commit in master: +``` +git fetch origin +git checkout master +git reset --hard origin/master +# We do not want the changes master from the release branch +git -s ours release_@MAJOR@@MINOR@ +# Be very careful here +git push origin master +``` + - [ ] Submit a PR in Spack that adds this new version of ADIOS (if not RC mark this new version as preferred) + - Run `spack checksum -a adios2` to add it, create commit; push it; Create + PR in Spack repo. +- [ ] Submit a PR in Conda that adds this new version of ADIOS (if not RC mark this new version as preferred) + - CondaForge robot should do this for you automatically, expect a new PR at + https://github.com/conda-forge/adios2-feedstock a couple of hours after the + release. - [ ] Write an announcement in the ADIOS-ECP mail-list (https://groups.google.com/a/kitware.com/g/adios-ecp)