From 7cf1efddbeb8de4e5ddf6a53d34e4d1cd2d18518 Mon Sep 17 00:00:00 2001 From: Marko Date: Wed, 6 May 2020 00:47:05 +0200 Subject: [PATCH] release: procedure change (#6148) --- .github/workflows/release-sims.yml | 4 ++-- CONTRIBUTING.md | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-sims.yml b/.github/workflows/release-sims.yml index 40a4040a11..08650bfba8 100644 --- a/.github/workflows/release-sims.yml +++ b/.github/workflows/release-sims.yml @@ -1,8 +1,8 @@ name: Release Sims on: - push: + pull_request: branches: - - /^v.*/ + - 'rc**' jobs: cleanup-runs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 024729e4fc..76c6d0e54d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -231,17 +231,17 @@ At the moment, only a single major release will be supported, so all point releases will be based off of that release. - start on `vX.XX.X` -- checkout a new branch `pre-rc/vX.X.X` +- checkout a new branch `rcN/vX.X.X` - cherry pick the desired changes from `master` - these changes should be small and NON-BREAKING (both API and state machine) - add entries to CHANGELOG.md and remove corresponding pending log entries -- checkout a new branch `rc/vX.X.X` based off of `vX.XX.X` -- create a PR merging `pre-rc/vX.X.X` into `rc/vX.X.X` +- checkout a new branch `release/vX.X.X` based off of the previous release +- create a PR merging `rcN/vX.X.X` into `release/vX.X.X` - run tests and simulations (noted in [Release Procedure](#release-procedure)) -- after tests and simulation have successfully completed, create the release branch `release/vX.XX.X` from the `RC` branch -- delete the `pre-rc/vX.X.X` and `RC` branches +- after tests and simulation have successfully completed, merge the `RC` branch into `release/vX.X.X` + - Make sure to delete the `RC` branch - create a PR into `master` containing ONLY the CHANGELOG.md updates -- tag (use `git tag -a`) then push the `release/vX.XX.X` branch & tag (`git push --tags`) +- tag (use `git tag -a`) then push the tags (`git push --tags`) ## Code Owner Membership