@@ -8,26 +8,18 @@ and `1.39.0` starts the next pre-release cycle.
88
99Complete these steps before release day:
1010
11- 1 . Create a pull request against ` main ` that updates the version in
12- ` package.json ` and ` package-lock.json ` to the next even minor version:
13-
14- ``` bash
15- npm version 1.38.0 --no-git-tag-version
16- ```
17-
18- 2 . Merge the version-bump pull request into ` main ` .
19- 3 . Create the release branch from the updated ` main ` branch. Name it
11+ 1 . Change the version in ` package.json ` to the next even minor version, for
12+ example ` 1.38.0 ` .
13+ 2 . Run ` npm i ` to update ` package-lock.json ` .
14+ 3 . Create and merge a pull request against ` main ` .
15+ 4 . Create the release branch from the updated ` main ` branch. Name it
2016 ` release/1.<even minor>.0 ` , for example ` release/1.38.0 ` , and push it to the
2117 upstream repository.
22- 4 . Create a second pull request against ` main ` that updates ` package.json ` and
23- ` package-lock.json ` to the next odd minor version:
24-
25- ``` bash
26- npm version 1.39.0 --no-git-tag-version
27- ```
28-
29- 5 . Merge the pre-release version-bump pull request into ` main ` . Do not merge
30- this change into the release branch.
18+ 5 . Change the version in ` package.json ` to the next odd minor version, for
19+ example ` 1.39.0 ` .
20+ 6 . Run ` npm i ` to update ` package-lock.json ` .
21+ 7 . Create and merge a second pull request against ` main ` . Do not merge this
22+ change into the release branch.
3123
3224The release branch must therefore retain the even version while ` main ` moves
3325back to an odd pre-release version.
@@ -49,17 +41,10 @@ Use the existing release branch for a patch to a stable release. For example,
4941release ` 1.38.1 ` from ` release/1.38.0 ` ; do not create a
5042` release/1.38.1 ` branch.
5143
52- 1 . Apply the required fixes to the existing release branch. If a fix was first
53- merged into ` main ` , cherry-pick the relevant commit onto a branch created
54- from the release branch.
55- 2 . On that branch, update the version in ` package.json ` and
56- ` package-lock.json ` to the new patch version:
57-
58- ``` bash
59- npm version 1.38.1 --no-git-tag-version
60- ```
61-
62- 3 . Create and merge a pull request targeting the existing release branch, for
44+ 1 . Change the version in ` package.json ` to the new patch version, for example
45+ ` 1.38.1 ` .
46+ 2 . Run ` npm i ` to update ` package-lock.json ` .
47+ 3 . Create and merge a pull request against the existing release branch, for
6348 example ` release/1.38.0 ` .
64494 . On release day, run the stable Azure Pipelines build from that release
6550 branch with ** Publish Extension** set to ` true ` .
0 commit comments