Skip to content

Commit 6ce75aa

Browse files
dgp1130filipesilva
authored andcommitted
docs: fold post-release version bump with the release commit
The process has changed and post-release bumps are no longer necessary. Also updated the doc to include a section on changing shifts with the caveat that you must be logged in to the `@angular.io` account to have edit access to the calendar. (cherry picked from commit a364e1f)
1 parent 19ef42a commit 6ce75aa

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

docs/process/release.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,16 @@ In general, cherry picks for LTS should only be done if it meets one of the crit
5555

5656
## Before releasing
5757

58-
Update `Angular` version in [`packages/schematics/angular/utility/latest-versions.ts`](https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/latest-versions.ts).
58+
Update `Angular` version in
59+
[`packages/schematics/angular/utility/latest-versions.ts`](https://github.com/angular/angular-cli/blob/master/packages/schematics/angular/utility/latest-versions.ts)
60+
**and** [`package.json`](https://github.com/angular/angular-cli/blob/master/package.json).
5961

6062
## Shepparding
6163

6264
As commits are cherry-picked when PRs are merged, creating the release should be a matter of creating a tag.
6365

6466
```bash
65-
git add packages/schematics/angular/utility/latest-versions.ts
67+
git add packages/schematics/angular/utility/latest-versions.ts package.json
6668
git commit -m 'release: vXX'
6769
git tag -a 'vXX' -m 'release: tag vXX'
6870
```
@@ -153,23 +155,11 @@ using the `--githubToken` flag. You just then have to confirm the draft.
153155

154156
> **Tags containing `next` or `rc` should be marked as pre-release.**
155157
156-
## Post-release Version Update
158+
## Post-release
157159

158-
**For each released version**:
159-
160-
Update `version` in root [`package.json`](/package.json#L3) to the _next_ release version.
161-
162-
```sh
163-
git checkout -b release-bump-vXX
164-
git commit package.json packages/schematics/angular/utility/latest-versions.ts -m "build: bump version to vXX"
165-
git push -u origin release-bump-vXX
166-
```
167-
168-
Then make a PR and assign it to the next primary caretaker.
169-
170-
Don't forget to update the Slack [#tools](https://angular-team.slack.com/archives/C46U16D4Z) channel topic and also post
171-
links to all the version bump PRs. If anyone else on the team notices these links missing, they should ask the caretaker
172-
to make sure the post-release version bump is not forgotten.
160+
Don't forget to update the Slack [#tools](https://angular-team.slack.com/archives/C46U16D4Z) channel
161+
topic with the next caretaker shift from the
162+
[calendar](https://calendar.google.com/calendar/embed?src=angular.io_jf53juok1lhpm84hv6bo6fmgbc%40group.calendar.google.com&ctz=America%2FLos_Angeles).
173163

174164
## Publishing a Major Version
175165

@@ -190,3 +180,13 @@ packages.
190180
```bash
191181
yarn admin dist-tag --version 10.0.0 --tag latest
192182
```
183+
184+
## Changing shifts
185+
186+
If you need to update the
187+
[caretaker calendar](https://calendar.google.com/calendar/embed?src=angular.io_jf53juok1lhpm84hv6bo6fmgbc%40group.calendar.google.com&ctz=America%2FLos_Angeles)
188+
to modify shifts, **make sure you are logged in as your @angular.io account** and
189+
click the "+ Google Calendar" button in the bottom right to add it to your Google
190+
Calendar account. You should then be able to find and modify events on
191+
calendar.google.com. The calendar is a part of the `angular.io` organization, so
192+
events can only be modified by users in the same organization.

0 commit comments

Comments
 (0)