diff --git a/README.md b/README.md index 27dcafa..4d71b0e 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,12 @@ [![Push Events](https://github.com/agrc/release-composite-action/actions/workflows/push.yml/badge.svg)](https://github.com/agrc/release-composite-action/actions/workflows/push.yml) -Automated releases based on the [Angular preset for Conventional Commits](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-format). +This action is a wrapper around Google's [release-please](https://github.com/googleapis/release-please) that adds some UGRC-specific conventions and enhancements. ## Usage ```yml +# push.yml name: Push Events on: @@ -15,12 +16,6 @@ on: - dev - main -permissions: - contents: write - id-token: write - deployments: write - pull-requests: write - concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -29,6 +24,9 @@ jobs: release: name: Create release runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write steps: - uses: agrc/release-composite-action@v1 @@ -42,6 +40,122 @@ jobs: github-app-email: ${{ secrets.UGRC_RELEASE_BOT_EMAIL }} ``` +## Commits + +Commits should have the following format: + +```text +[(optional scope)]: + +[optional body] + +[optional footer] +``` + +### Commit Types + +This action uses release-please to auto-generates a changelog based on commits using the [Angular preset for Conventional Commits](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-format). + +The following commit message types trigger new releases. + +| Type | Description | Release Type | Changelog Section | +| -- | -- | -- | -- | +| `feat` | A new feature | Minor | Features | +| `fix` | A bug fix | Patch | Bug Fixes | +| `docs` | Documentation updates | Patch | Documentation | +| `style` | Changes to the appearance of the project/UI | Patch | Styles | +| `deps` | A dependency update. Dependabot should [be configured](https://github.com/agrc/release-composite-action/blob/6bdccbb5a1f882e756a3e6e09a3b3f699c55bfd4/.github/dependabot.yml#L12-L14) to use this prefix. | Patch | Dependencies | + +The following commit message types are supported but will not trigger a release or show up in the changelog. +| Type | Description | +| -- | -- | +| `chore` | Any sort of change that does not affect the deployed project | +| `ci` | Changes to CI configuration files and scripts | +| `perf` | A code change that improves performance | +| `refactor` | A code change that neither fixes a bug nor adds a feature | +| `test` | Adding missing tests or correcting existing tests | + +### Scope + +Scopes are a way to add context to the commits and therefore the changelog. They are optional and should be in parentheses. For example: + +```text +feat(app): add a new app feature +feat(api): add a new api feature +feat: add a new feature +``` + +This commit message would show up like this in the changelog: + +```markdown +### Features + +- **app:** add a new app feature () +- **api:** add a new api feature () +- add a new feature () +``` + +### Summary + +Commit summaries should be written using imperative, present tense ("fix" not "fixed" or "fixes"), lowercase (do not capitalize the first word or use punctuation). The commit summaries are added to the changelog. + +For example: + +```text +feat: add a new feature +``` + +### Body + +Continue to use imperative, present tense. The body should include a more detailed description of the change. This is where you can provide more context and reasoning for the change. The body does not show up in the changelog. + +### Footer + +The footer should contain any references to GitHub issues: `closes #1234`, `refs #1234`, etc. `closes` will automatically close the issue when the commit is merged and `refs` will add a link to the commit in the referenced issue or pull request. The footer may also include information about a breaking change (see below). + +> [!NOTE] +> The body is not required to use the footer. + +### Breaking Changes + +If a commit introduces a breaking change, add a `!` after the type. This will trigger a major version bump. + +> [!IMPORTANT] +> A `BREAKING CHANGE: ` section is required in the commit footer. + +```text +fix!: add missing constructor parameter + +Some detailed description that will not show up in the changelog. + +BREAKING CHANGE: summary of breaking change +- breaking change description +- migration instructions +- etc + +Anything after the first blank line will not be included in the changelog. +``` + +The above commit would show up in the changelog like this: + +```markdown +### ⚠ BREAKING CHANGES + +* summary of breaking change + - breaking change description + - migration instructions + - etc + +### Bug Fixes + +* add missing constructor parameter ([5b757c3](https://github.com/agrc/release-composite-action/commit/5b757c31c4bb2e04efb19c6de1dacd0689bcbe72)) +``` + +> [!NOTE] +> This follow are available to use with breaking changes: `feat!`, `fix!`, or `refactor!` + +You may dig into the [release-please](https://github.com/googleapis/release-please#how-should-i-write-my-commits) and the [Angular preset](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#commit-message-footer) documentation for more information. + ## Development ### Act Test Runner