From eb9bad7a3181773fa22d2d6e2ac928115d593c76 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 12 Jun 2019 16:20:51 -0400 Subject: [PATCH] chore(): revise process doc (#18530) --- .github/PROCESS.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/PROCESS.md b/.github/PROCESS.md index a0ec752ba6..622834133a 100644 --- a/.github/PROCESS.md +++ b/.github/PROCESS.md @@ -221,9 +221,11 @@ Hotfixes bypass `master` and should only be used for urgent fixes that can't wai ## Releasing -1. Create the release branch from `master`, for example: `release-4.1.0`. +1. Create the release branch from `master`, for example: `release-4.5.0`. -1. Submit a pull request from the release branch into `stable`. Do not merge this pull request yet. +1. For major or minor releases, create a version branch based off the latest version branch. For example, if releasing 4.5.0, create a branch called `4.5.x` based off `4.4.x`. + +1. Submit a pull request from the release branch into the version branch. Do not merge this pull request yet. 1. Verify all tests are passing, fix any bugs if needed and make sure no undesired commits are in. @@ -235,7 +237,8 @@ Hotfixes bypass `master` and should only be used for urgent fixes that can't wai - Select the version based on the type of commits and the [Ionic Versioning](https://ionicframework.com/docs/intro/versioning) - After the process completes, verify the version number in all packages (`core`, `docs`, `angular`) - Verify the changelog commits are accurate and follow the [proper format]((https://github.com/ionic-team/ionic/blob/master/.github/CONTRIBUTING.md#commit-message-format)) - - Commit these changes with the version number as the message, e.g. `git commit -m "4.1.0"` + - For major or minor releases, ensure that the version number has an associated title (for example: `4.5.0 Boron`) + - Commit these changes with the version number as the message, e.g. `git commit -m "4.5.0"` 1. Run `npm run release` @@ -243,10 +246,6 @@ Hotfixes bypass `master` and should only be used for urgent fixes that can't wai Merge pull request button -1. Rewrite the commit message to `merge release-4.1.0` with the proper release branch. For example, if this release is for `4.3.1`, the message would be `merge release-4.3.1`. +1. Rewrite the commit message to `merge release-[VERSION]` with the proper release branch. For example, if this release is for `4.5.0`, the message would be `merge release-4.5.0`. -1. Submit a pull request from the `stable` branch into `master`. Merge this pull request using the same commit format in the last step, to ensure any changes made on the release branch get added to future releases. - -1. Merge the release branch into its corresponding version branch. - - If this is a major or minor release, create the version branch off the latest `stable`. For example, if this release was `4.2.0`, create a branch called `4.2.x` off of `stable`. - - If this is a patch release, merge the release branch into the version branch. For example, if this release is `4.2.1`, merge the release branch into the `4.2.x` branch. +1. Submit a pull request from the release branch into `master`. Merge this pull request using the same commit format in the last step, to ensure any changes made on the release branch get added to future releases. \ No newline at end of file