Skip to content

Commit

Permalink
Merge pull request #111 from garlick/mergify
Browse files Browse the repository at this point in the history
add mergify support
  • Loading branch information
garlick authored Dec 29, 2024
2 parents b4b5e8e + 76fd64e commit 1606e4c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
cc: [gcc, clang]
os: [ubuntu-latest, ubuntu-18.04]
os: [ubuntu-latest]

steps:
- uses: actions/checkout@v2
Expand Down
26 changes: 26 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
queue_rules:
- name: default
queue_conditions:
- base=master
- label="merge-when-passing"
- label!="work-in-progress"
- -title~=^\[*[Ww][Ii][Pp]
- "approved-reviews-by=@chaos/diod-admins"
- "#approved-reviews-by>0"
- "#changes-requested-reviews-by=0"
merge_conditions:
- base=master
- label="merge-when-passing"
- label!="work-in-progress"
- "approved-reviews-by=@chaos/diod-admins"
- "#approved-reviews-by>0"
- "#changes-requested-reviews-by=0"
- -title~=^\[*[Ww][Ii][Pp]
update_method: rebase
merge_method: merge

pull_request_rules:
- name: rebase and merge when passing all checks
conditions: []
actions:
queue:

0 comments on commit 1606e4c

Please sign in to comment.