Skip to content

Commit

Permalink
Merge branch 'main' into gh-checkout-update
Browse files Browse the repository at this point in the history
  • Loading branch information
tkxkd0159 authored Oct 26, 2023
2 parents 59cddf1 + c7553b3 commit 0ec29b0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -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
10 changes: 9 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
* (ci) [\#296](https://github.com/Finschia/finschia/pull/296) bump actions/checkout from 3 to 4

### Docs
Expand Down

0 comments on commit 0ec29b0

Please sign in to comment.