Skip to content

Commit 06ededf

Browse files
authored
Merge pull request #576 from Automattic/fix/notes-about-releasing
Docs: Update notes for releasing
2 parents efa778a + 8069922 commit 06ededf

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

.github/CONTRIBUTING.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,18 @@ An example where it might not would be when a ruleset references a local sniff o
193193
The `composer test` or `composer ruleset` commands run the `ruleset-test.php` files (one for each standard), which internally run `phpcs` against the "dirty" test files (`ruleset-test.inc`), and looks out for a known number of errors, warnings, and messages on each line. This is then compared against the expected errors, warnings and messages to see if there are any missing or unexpected violations or difference in messages.
194194

195195
When adding or changing a sniff, the ruleset test files should be updated to match.
196+
197+
## Releases
198+
199+
- In a `changelog/x.y.z` branch off of `develop`, update the `CHANGELOG.md` with a list of all of the changes following the keepachangelog.com format. Include PR references and GitHub username props.
200+
- Create a PR of `develop` <-- `changelog/x.y.z`, but do not merge until ready to release.
201+
- Create a PR of `master` <-- `develop`, and copy-paste the [`release-template.md`](https://github.com/Automattic/VIP-Coding-Standards/blob/develop/.github/ISSUE_TEMPLATE/release-template.md) contents.
202+
- When ready to release, merge the change log PR into `develop`, then merge the `develop` into `master` PR.
203+
- Tag the commit in `master` with the appropriate version number. Ideally, have it signed.
204+
- Close the current milestone.
205+
- Open a new milestone for the next release.
206+
- If any open PRs/issues which were milestoned for this release do not make it into the release, update their milestone.
207+
- Write a Lobby post to inform VIP customers about the release, including the date when the Review Bot will be updated (usually about 1.5 weeks after the VIPCS release).
208+
- Write an internal P2 post.
209+
- Open a PR to update the [Review Bot dependencies](https://github.com/Automattic/vip-go-ci/blob/master/tools-init.sh).
210+

.github/ISSUE_TEMPLATE/release-template.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ assignees: GaryJones, rebeccahum
99

1010
⚠️ DO NOT MERGE (YET) ⚠️
1111

12-
Please do add approvals if you agree.
12+
[Remaining work for this Milestone](https://github.com/Automattic/VIP-Coding-Standards/milestone/X)
1313

14-
PR for tracking changes for the 2.x.y release. Target release date: DOW DD MMMM.
14+
PR for tracking changes for the X.Y.Z release. Target release date: DOW DD MMMM YYYY.
1515

16-
- [ ] Add changelog for this release.
16+
- [ ] Add change log for this release: PR #XXX
1717
- [ ] Merge this PR.
18-
- [ ] Add release tag against `master`.
18+
- [ ] Add signed release tag against `master`.
1919
- [ ] Close the current milestone.
2020
- [ ] Open a new milestone for the next release.
2121
- [ ] If any open PRs/issues which were milestoned for this release do not make it into the release, update their milestone.

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# VIP Coding Standards
22

3-
This project contains [PHP_CodeSniffer (PHPCS) sniffs and rulesets](https://github.com/squizlabs/PHP_CodeSniffer) to validate code developed for [WordPress.com VIP](https://wpvip.com/).
3+
This project contains [PHP_CodeSniffer (PHPCS) sniffs and rulesets](https://github.com/squizlabs/PHP_CodeSniffer) to validate code developed for [WordPress VIP](https://wpvip.com/).
44

55
This project contains two rulesets:
66

@@ -25,14 +25,13 @@ Go to https://wpvip.com/documentation/phpcs-review-feedback/ to learn about why
2525

2626
This will install the latest compatible versions of PHPCS and WPCS.
2727

28-
2928
Please refer to the [installation instructions for installing PHP_CodeSniffer for WordPress.com VIP](https://wpvip.com/documentation/how-to-install-php-code-sniffer-for-wordpress-com-vip/) for more details.
3029

3130
We recommend the [PHP_CodeSniffer Standards Composer Installer Plugin](https://github.com/Dealerdirect/phpcodesniffer-composer-installer), which handles the registration of all of the installed standards, so there is no need to set the `installed_paths` config value manually, for single or multiple standards.
3231

3332
Alternatively, you should register the standard to PHPCS by appending the VIPCS directory to the end of the installed paths. e.g.
3433

35-
`phpcs --config-set installed_paths /path/to/wpcsstandard,path/to/vipcsstandard,etc.`
34+
`phpcs --config-set installed_paths /path/to/wpcsstandard,path/to/vipcsstandard`
3635

3736
## Contribution
3837

0 commit comments

Comments
 (0)