mirror of
https://github.com/zmkfirmware/zmk.git
synced 2026-03-20 04:55:20 -05:00
ci: Add gitlint and document commit conventions
* Add gitlint to pre-commit setup * Update pre-commit setup for installing commit-hooks * Add "Commit Conventions" contributing docs Co-authored-by: Cem Aksoylar <caksoylar@users.noreply.github.com>
This commit is contained in:
committed by
Pete Johanson
parent
b0f5789b12
commit
14c6fb74ee
70
docs/docs/development/contributing/commit-messages.md
Normal file
70
docs/docs/development/contributing/commit-messages.md
Normal file
@@ -0,0 +1,70 @@
|
||||
---
|
||||
title: Commit Messages
|
||||
---
|
||||
|
||||
The ZMK project uses [conventional commits](https://www.conventionalcommits.org/) for their commit messages. This not only provides consistency for our commits, but also allows for release/versioning automation to determine the next version to release, generating changelogs, etc.
|
||||
|
||||
Commit messages will be checked as part of our CI process by GitHub Actions.
|
||||
|
||||
## Guidelines
|
||||
|
||||
Commits should have the following:
|
||||
|
||||
- A first line prefix that includes a [type](#types), as well as appropriate [scope](#scopes) in parentheses as needed.
|
||||
- Following the prefix, a concise summary of the change, which documents the new behavior/feature/functionality in the positive (e.g. "wake from sleep now works with charlieplex kscan", not "fixed waked from sleep bug with charlieplex kscan driver").
|
||||
- A blank line following the first line.
|
||||
- A body that provides more detail of the changes. This _may_ be a bulleted list or paragraph prose.
|
||||
- An optional set of [git trailers](https://git-scm.com/docs/git-interpret-trailers#_description) for things like [GitHub keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests) following a blank line.
|
||||
|
||||
## Example
|
||||
|
||||
Here is an example of a good commit message:
|
||||
|
||||
```
|
||||
feat(boards): Add numpad layouts
|
||||
|
||||
Added physical layouts for the following variants of numpads:
|
||||
|
||||
- With and without extra top row
|
||||
- 2U plus key or 1U plus and backspace keys
|
||||
- 2U 0 key or 1U 0 and 00 keys
|
||||
- Full 1U grid/macropad layout
|
||||
|
||||
Other layouts exist, such as "southpaw" horizontally mirrored layouts,
|
||||
and layouts with a fifth column, but those seem to be much less common.
|
||||
```
|
||||
|
||||
## Pre-Commit
|
||||
|
||||
To help make sure you don't need to wait for GitHub Actions to check your commits, you can [set up pre-commit](../local-toolchain/pre-commit.md) to check your commits as you create them.
|
||||
|
||||
## Types
|
||||
|
||||
The following commit types are used by ZMK:
|
||||
|
||||
- `blog:` -- changes to our documentation found in the `docs/blog` directory
|
||||
- `docs:` -- changes to our documentation found in the `docs/` directory, except blogs
|
||||
- `feat:` -- changes that add a new feature
|
||||
- `fix:` -- changes that fix existing functionality
|
||||
- `refactor:` -- changes that refactor existing functionality without adding any new features
|
||||
- `feat!:`/`refactor!:`/`fix!:` -- same as above, but indicates a breaking change. Examples would be changes to the public C API, renaming a board/shield, editing a board or shield to rename devicetree labels that may be used in keymaps, etc.
|
||||
- `ci:` -- changes to our continuous integration setup with GitHub Actions, usually only for the files in `.github/workflows/`
|
||||
- `chore:` -- grab bag type for small changes that don't fall into any of the above categories, including dependency updates for development tools and docs.
|
||||
|
||||
## Scopes
|
||||
|
||||
The following scopes are frequently used to further clarify the scope of the change:
|
||||
|
||||
- `hid` -- changes to our general HID code
|
||||
- `usb` -- changes specific to USB
|
||||
- `ble` -- changes specific to BLE
|
||||
- `power` -- changes to our power management code
|
||||
- `split` -- changes to our split keyboard support
|
||||
- `studio` -- changes to our ZMK Studio code
|
||||
- `display` -- changes to to our display code
|
||||
- `underglow` -- changes to to our RGB underglow support
|
||||
- `backlight` -- changes to to our simple LED backlight support
|
||||
- `behaviors` -- changes to to our core behavior code
|
||||
- `core` -- changes to any other area of our core code
|
||||
- `boards` -- changes to the in-tree boards
|
||||
- `shields` -- changes to the in-tree shields
|
||||
@@ -22,12 +22,14 @@ Now that pre-commit is installed on your PC, you need to install it into the ZMK
|
||||
|
||||
```bash
|
||||
pre-commit install
|
||||
pre-commit install --hook-type commit-msg
|
||||
```
|
||||
|
||||
This should print a message such as
|
||||
|
||||
```
|
||||
pre-commit installed at .git\hooks\pre-commit
|
||||
pre-commit installed at .git/hooks/pre-commit
|
||||
pre-commit installed at .git/hooks/commit-msg
|
||||
```
|
||||
|
||||
Pre-commit will now automatically check your changes whenever you run `git commit`. If it detects a problem, it will describe the problem and cancel the commit. For simple problems such as incorrect formatting, it will also automatically fix the files so you can just `git add` them and try again.
|
||||
|
||||
@@ -142,6 +142,7 @@ module.exports = {
|
||||
collapsed: true,
|
||||
items: [
|
||||
"development/contributing/clean-room",
|
||||
"development/contributing/commit-messages",
|
||||
"development/contributing/documentation",
|
||||
],
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user