Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Add gitlint and document commit conventions #2623

Merged

Conversation

petejohanson
Copy link
Contributor

  • Add gitlint to pre-commit setup
  • Update pre-commit setup for installing commit-hooks
  • Add "Commit Conventions" contributing docs

@petejohanson petejohanson added the github_actions Pull requests that update Github_actions code label Nov 8, 2024
@petejohanson petejohanson self-assigned this Nov 8, 2024
@petejohanson petejohanson requested review from a team as code owners November 8, 2024 19:55
docs/docs/development/contributing/commit-messages.md Outdated Show resolved Hide resolved
- `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 indicate a breaking change.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Breaking change" might need elaboration here, e.g. as it relates to #2619. We can at least mention the easy ones for now, like board/shield changes or anything that affects user keymaps.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a bit more context here. Thoughts?

- `refactor:` - changes that refactor existing functionality without adding any new features
- `feat!:`/`refactor!:`/`fix!` - same as above, but indicate a breaking change.
- `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.
Copy link
Contributor

@caksoylar caksoylar Nov 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do dependency updates for e.g. docs fall into docs or chore?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, dependabot uses chore for this.

- `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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want lighting to cover backlight etc. as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'd be good to keep them distinct, IMHO, since there's already enough confusion generally about the two. IMHO, we should use backlight for this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a separate entry.

@Nick-Munnich
Copy link
Contributor

I believe this makes #586 redundant.

Copy link
Contributor

@caksoylar caksoylar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, suggested mostly cosmetic improvements.

docs/docs/development/contributing/commit-messages.md Outdated Show resolved Hide resolved
docs/docs/development/contributing/commit-messages.md Outdated Show resolved Hide resolved
docs/docs/development/contributing/commit-messages.md Outdated Show resolved Hide resolved
docs/docs/development/contributing/commit-messages.md Outdated Show resolved Hide resolved
@petejohanson petejohanson force-pushed the chore/add-gitlint-integration branch from 3978eeb to 6739e47 Compare November 11, 2024 23:39
* Add gitlint to pre-commit setup
* Update pre-commit setup for installing commit-hooks
* Add "Commit Conventions" contributing docs

Co-authored-by: Cem Aksoylar <[email protected]>
@petejohanson petejohanson force-pushed the chore/add-gitlint-integration branch from 6739e47 to 915d767 Compare November 11, 2024 23:47
@petejohanson petejohanson merged commit 14c6fb7 into zmkfirmware:main Nov 13, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
github_actions Pull requests that update Github_actions code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants