Skip to content

Commit b5ddb96

Browse files
docs: polish collaboration wording
1 parent df6170c commit b5ddb96

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

Collaboration.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,67 @@ This document describes how collaborators of this repository should work togethe
44

55
## Pull Requests
66

7-
- never merge your own PR's
8-
- never merge without someone having approved (approving and merging from same person is allowed)
7+
- never merge your own PRs
8+
- never merge without someone having approved (approving and merging by the same person is allowed)
99
- wait for all approvals requested (or the author decides something different in the comments)
1010
- merge to `master` only for releases or other urgent issues (update notification is only triggered by tags)
11-
- merges to master should be tagged with the "mastermerge" label so that the test runs through
11+
- merges to `master` should be tagged with the `mastermerge` label so that the test runs through
1212

1313
## Issues
1414

15-
- "real" Issues are closed if the problem is solved and the fix is released
16-
- unrelated Issues (e.g. related to a foreign module) are closed immediately with a comment to open an issue in the module repository or to discuss this further in the forum or discord
15+
- "real" issues are closed if the problem is solved and the fix is released
16+
- unrelated issues (e.g. related to a third-party module) are closed immediately with a comment to open an issue in the module repository or to discuss this further in the forum or Discord
1717

1818
## Releases
1919

20-
Are done by
20+
Releases are done by:
2121

22-
- [ ] @rejas
23-
- [ ] @sdetweil
24-
- [ ] @khassel
25-
- [ ] @KristjanESPERANTO
22+
- @rejas
23+
- @sdetweil
24+
- @khassel or
25+
- @KristjanESPERANTO
2626

27-
### Pre-Deployment steps
27+
### Pre-Deployment Steps
2828

2929
- [ ] update dependencies (a few days before)
3030

31-
### Deployment steps
31+
### Deployment Steps
3232

33-
- [ ] pull latest `develop` branch
33+
- [ ] pull the latest `develop` branch
3434
- [ ] create `prep-release` branch from `develop`
3535
- [ ] update `package.json` and `package-lock.json` to reflect correct version number `2.xx.0`
3636
- [ ] test `prep-release` branch
3737
- [ ] commit and push all changes
3838
- [ ] create pull request from `prep-release` to `develop` branch with title `Prepare Release 2.xx.0`
39-
- [ ] after successful test run via github actions: merge pull request to `develop`
39+
- [ ] after successful test run via GitHub Actions: merge pull request to `develop`
4040
- [ ] review the content of the automatically generated draft release named `unreleased`
4141
- [ ] check contributor names
42-
- [ ] check auto generated min. node version and adjust it for better readability if necessary
42+
- [ ] check auto-generated minimum Node.js version and adjust it for better readability if necessary
4343
- [ ] check if all elements are assigned to the correct category
4444
- [ ] change release name to `v2.xx.0`
45-
- [ ] after successful test run via github actions: create pull request from `develop` to `master` branch
45+
- [ ] after successful test run via GitHub Actions: create pull request from `develop` to `master` branch
4646
- [ ] add label `mastermerge`
4747
- [ ] title of the PR is `Release 2.xx.0`
4848
- [ ] description of the PR is the body of the draft release with name `v2.xx.0`
49-
- [ ] check if new PR has merge conflicts, if so, merge `master` into the new PR and solve the conflicts
50-
- [ ] after PR tests run without issues, merge PR
49+
- [ ] check if the new PR has merge conflicts, if so, merge `master` into the new PR and solve the conflicts
50+
- [ ] after PR tests run without issues, merge the PR
5151
- [ ] edit draft release with name `v2.xx.0`
5252
- [ ] set corresponding version tag `v2.xx.0` (with `Select tag` and then `Create new tag`)
53-
- [ ] update release link in `Compare to previous Release` by replacing `develop` with new tag `v2.xx.0`
53+
- [ ] update release link in `Compare to previous Release` by replacing `develop` with the new tag `v2.xx.0`
5454
- [ ] publish the release (button at the bottom)
5555

5656
### Draft new development release
5757

58-
- [ ] checkout `develop` branch
58+
- [ ] check out `develop` branch
5959
- [ ] update `package.json` and `package-lock.json` to reflect correct version number `2.xx.0-develop`
6060
- [ ] commit and push `develop` branch
61-
- [ ] if new release will be in January, update the year in LICENSE.md
61+
- [ ] if the new release will be in January, update the year in `LICENSE.md`
6262

6363
### After release
6464

65-
- [ ] publish release notes with link to github release on forum in new locked topic (use edit release on github to copy the content with markdown syntax)
65+
- [ ] publish release notes with a link to the GitHub release on the forum in a new locked topic (use edit release on GitHub to copy the content with Markdown syntax)
6666
- [ ] close all issues with label `ready (coming with next release)`
67-
- [ ] release new documentation by merging `develop` on `master` in documentation repository
67+
- [ ] release new documentation by merging `develop` into `master` in the documentation repository
6868
- [ ] publish new version on [npm](https://www.npmjs.com/package/magicmirror)
6969
- [ ] use a clean environment (e.g. container)
7070
- [ ] clone this repository with the new `master` branch and `cd` into the local repository directory
@@ -74,7 +74,7 @@ Are done by
7474
- [ ] execute `npm publish`
7575
- [ ] **Method 2 (fallback for headless environments): With token (bypasses 2FA)**
7676
- [ ] ⚠️ Note: This method bypasses 2FA and should only be used when a browser is not available
77-
- [ ] goto `https://www.npmjs.com/settings/<username>/tokens/` and click `generate new token`
77+
- [ ] go to `https://www.npmjs.com/settings/<username>/tokens/` and click `generate new token`
7878
- [ ] enable `Bypass two-factor authentication (2FA)` and under `Packages and scopes` give `Read and write` permission to the `magicmirror` package, press `Generate token`
7979
- [ ] execute:
8080

0 commit comments

Comments
 (0)