diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 00000000..1f0a7c56 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,3 @@ +# These owners will be the default owners for everything in +# the repo. Unless a later match takes precedenc +* @tkxkd0159 @zemyblue @0Tech @jaeseung-bae diff --git a/.mergify.yml b/.mergify.yml index c41d6f4f..65a62068 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -6,7 +6,7 @@ queue_rules: pull_request_rules: - name: Automatic merge to main with label automerge and branch protection passing conditions: - - "#approved-reviews-by>=1" + - "#approved-reviews-by>1" - base=main - label=automerge actions: @@ -16,3 +16,11 @@ pull_request_rules: commit_message_template: | {{ title }} (#{{ number }}) {{ body }} + - name: backport patches to v2.0.x branch + conditions: + - base=main + - label=backport/v2.0.x + actions: + backport: + branches: + - release/v2.0.x diff --git a/CHANGELOG.md b/CHANGELOG.md index 4612385d..c683a118 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Build, CI * (ci) [\#290](https://github.com/Finschia/finschia/pull/290) remove autopr ci * (ci) [\#291](https://github.com/Finschia/finschia/pull/291) fix goreleaser ci error and replace release-build +* (repo) [\#295](https://github.com/Finschia/finschia/pull/295) setup CODEOWNERS and backport action ### Docs