Skip to content

Commit

Permalink
Merge pull request godwokenrises#267 from keroro520/docs-contributing-md
Browse files Browse the repository at this point in the history
docs: add CONTRIBUTING.md
  • Loading branch information
keroro520 committed Jun 6, 2022
2 parents 6d6232c + bf8301a commit 4417dcb
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ Whenever you encounter a problem with Kicker, please let us know by providing th
- Service running status: `./kicker ps`
- Service logs: `./kicker logs`

## Contributing to Godwoken-Kicker

[CONTRIBUTING.md](docs/CONTRIBUTING.md)

## More

* [Manual build mode](docs/manual-build.md)
Expand Down
16 changes: 16 additions & 0 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Contributing to Godwoken-Kicker

We use the [Trunk-Based Development Flow](https://trunkbaseddevelopment.com/branch-for-release/). We maintain only one long-lived branch, the "main" branch.

## Pull Request

- Most of the time, you should submit PRs to the "main" branch.
- When submitting PR and it should be noted in the release note, please write down the release note in the PR description and mark the PR with "release-note" label
- When submiting PR and it brings breaking-changs, please please write down the release note in the PR description and mark the PR with "release-note" and "breaking-change" label

## Release Process

- At the scheduled time, checkouts a "rc-" branch from the current "main" branch
- As for non-emergence commits and patches, submit PRs to the "main" branch, then cherry-pick commits from "main" to "rc-"
- As for emergence hotfix, although Godwoken-Kicker should have no emergence hotfixes, make PRs to "rc-hotfix" branch, then cherry-pick to "main" branch.
- Since Godwoken-Kicker is not a production project, we don't have to maintain a CHANGELOG.md.

0 comments on commit 4417dcb

Please sign in to comment.