From 1abd0f015852a657e9ada5f4679bec2a8cfff9f2 Mon Sep 17 00:00:00 2001 From: Jayden Lee <41176085+tkxkd0159@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:25:05 +0900 Subject: [PATCH 1/4] add a backport action --- .mergify.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 From 8708d062a51bea2849d29b2e4205271282abc821 Mon Sep 17 00:00:00 2001 From: Jayden Lee <41176085+tkxkd0159@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:25:48 +0900 Subject: [PATCH 2/4] add CODEOWNERS --- .github/CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/CODEOWNERS 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 From d8cb74e4a17e7d468cce19459259b00085119cce Mon Sep 17 00:00:00 2001 From: Jayden Lee <41176085+tkxkd0159@users.noreply.github.com> Date: Thu, 26 Oct 2023 14:27:58 +0900 Subject: [PATCH 3/4] add CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4612385d..671f1f63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements * (improvements) [\#230](https://github.com/Finschia/finschia/pull/230) fix Makefile for format and execute make format #230 +* (repo) [\#295](https://github.com/Finschia/finschia/pull/295) setup CODEOWNERS and backport action ### Bug Fixes From 177fe7d6cf6a1bb33868929f7983ca0e8ee67c1d Mon Sep 17 00:00:00 2001 From: Jayden Lee <41176085+tkxkd0159@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:10:55 +0900 Subject: [PATCH 4/4] chore --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 671f1f63..c683a118 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,7 +40,6 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements * (improvements) [\#230](https://github.com/Finschia/finschia/pull/230) fix Makefile for format and execute make format #230 -* (repo) [\#295](https://github.com/Finschia/finschia/pull/295) setup CODEOWNERS and backport action ### Bug Fixes @@ -49,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