From b922d3c58b773a02cc5b92431e11e37a01da59f4 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Sat, 4 May 2019 10:42:59 -0400 Subject: [PATCH] Merge PR #4270: Update Point Release Procedure section --- CONTRIBUTING.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f4a73ac36f..8ce1fd62d4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -201,9 +201,11 @@ releases will be based off of that release. - checkout a new branch `pre-rc/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 - - checkout a new branch `rc/vX.X.X` + - 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` - 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 + - create a PR into `master` containing ONLY the CHANGELOG.md updates - tag and release `release/vX.XX.X`