Skip to content

Commit 1f3b7b6

Browse files
authored
docs: Add documentation for releases and commit style (#5675)
1 parent bd8437b commit 1f3b7b6

File tree

2 files changed

+63
-9
lines changed

2 files changed

+63
-9
lines changed

docs/CONTRIBUTING.md

+47
Original file line numberDiff line numberDiff line change
@@ -199,3 +199,50 @@ one or more reviewers making new comments every time, then waiting for an
199199
updated change before reviewing again. All contributors, including those from
200200
maintainers, are subject to the same review cycle; this process is not meant to
201201
be applied selectively or to discourage anyone from contributing.
202+
203+
## Releases
204+
205+
Coder releases are initiated via [`./scripts/release.sh`](../scripts/release.sh) and automated via GitHub Actions. Specifically, the [`release.yaml`](../.github/workflows/release.yaml) workflow. They are created based on the current [`main`](https://github.com/coder/coder/tree/main) branch.
206+
207+
The release notes for a release are automatically generated from commit titles and metadata from PRs that are merged into `main`.
208+
209+
### Creating a release
210+
211+
The creation of a release is initiated via [`./scripts/release.sh`](../scripts/release.sh). This script will show a preview of the release that will be created, and if you choose to continue, create and push the tag which will trigger the creation of the release via GitHub Actions.
212+
213+
See `./scripts/release.sh --help` for more information.
214+
215+
### Creating a release (via workflow dispatch)
216+
217+
Typically the workflow dispatch is only used to test (dry-run) a release, meaning no actual release will take place. The workflow can be dispatched manually from [Actions: Release](https://github.com/coder/coder/actions/workflows/release.yaml). Simply press "Run workflow" and choose dry-run.
218+
219+
If a release has failed after the tag has been created and pushed, it can be retried by again, pressing "Run workflow", changing "Use workflow from" from "Branch: main" to "Tag: vX.X.X" and not selecting dry-run.
220+
221+
### Commit messages
222+
223+
Commit messages should follow the [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/) specification.
224+
225+
Allowed commit types (`feat`, `fix`, etc.) are listed in [conventional-commit-types](https://github.com/commitizen/conventional-commit-types/blob/c3a9be4c73e47f2e8197de775f41d981701407fb/index.json). Note that these types are also used to automatically sort and organize the release notes.
226+
227+
A good commit message title uses the imperative, present tense and is ~50
228+
characters long (no more than 72).
229+
230+
Examples:
231+
232+
- Good: `feat(api): Add feature X`
233+
- Bad: `feat(api): Added feature X` (past tense)
234+
235+
A good rule of thumb for writing good commit messages is to recite: [If applied, this commit will ...](https://reflectoring.io/meaningful-commit-messages/).
236+
237+
**Note:** We lint PR titles to ensure they follow the Conventional Commits specification, however, it's still possible to merge PRs on GitHub with a badly formatted title. Take care when merging single-commit PRs as GitHub may prefer to use the original commit title instead of the PR title.
238+
239+
### Breaking changes
240+
241+
Breaking changes can be triggered in two ways:
242+
243+
- Add `!` to the commit message title, e.g. `feat(api)!: Remove deprecated endpoint /test`
244+
- Add the [`release/breaking`](https://github.com/coder/coder/issues?q=sort%3Aupdated-desc+label%3Arelease%2Fbreaking) label to a PR that has, or will be, merged into `main`.
245+
246+
### Security
247+
248+
The [`security`](https://github.com/coder/coder/issues?q=sort%3Aupdated-desc+label%3Asecurity) label can be added to PRs that have, or will be, merged into `main`. Doing so will make sure the change stands out in the release notes.

scripts/release.sh

+16-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cdroot
77

88
usage() {
99
cat <<EOH
10-
Usage: ./release.sh [--dry-run] [--ref <ref>] [--major | --minor | --patch]
10+
Usage: ./release.sh [--dry-run] [-h | --help] [--ref <ref>] [--major | --minor | --patch]
1111
1212
This script should be called to create a new release.
1313
@@ -17,18 +17,25 @@ based on if the release contains breaking changes or not. If the release
1717
contains breaking changes, a new minor version will be created. Otherwise, a
1818
new patch version will be created.
1919
20-
Set --ref if you need to specify a specific commit that the new version will
21-
be tagged at, otherwise the latest commit will be used.
22-
23-
Set --minor to force a minor version bump, even when there are no breaking
24-
changes. Likewise for --major. By default a patch version will be created.
25-
26-
Set --dry-run to see what this script would do without making actual changes.
27-
2820
To mark a release as containing breaking changes, the commit title should
2921
either contain a known prefix with an exclamation mark ("feat!:",
3022
"feat(api)!:") or the PR that was merged can be tagged with the
3123
"release/breaking" label.
24+
25+
GitHub labels that affect release notes:
26+
27+
- release/breaking: Shown under BREAKING CHANGES, prevents patch release.
28+
- security: Shown under SECURITY.
29+
30+
Flags:
31+
32+
Set --major or --minor to force a larger version bump, even when there are no
33+
breaking changes. By default a patch version will be created, --patch is no-op.
34+
35+
Set --ref if you need to specify a specific commit that the new version will
36+
be tagged at, otherwise the latest commit will be used.
37+
38+
Set --dry-run to see what this script would do without making actual changes.
3239
EOH
3340
}
3441

0 commit comments

Comments
 (0)