Skip to content

Commit

Permalink
feat(ci): add mergify configuration (#172)
Browse files Browse the repository at this point in the history
* feat(ci): add mergify configuration

* meta: add work-in-progress label
* fix: restrict build and docker workflows to main
  • Loading branch information
cameronraysmith committed Sep 11, 2023
1 parent b72d854 commit 8d791af
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@
- name: wontfix
description: This will not be worked on
color: ffffff
- name: work-in-progress
description: Work in progress that should not be auto-merged
color: ffffff
11 changes: 11 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
pull_request_rules:
- name: automatic merge for main when CI passes and 2 reviews and not WIP
conditions:
- "#approved-reviews-by>=1"
- check-success=Build / test (3.10)
- check-success=Docker / build-and-push-image
- base=main
- label!=work-in-progress
actions:
merge:
method: squash
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Build
on:
workflow_dispatch:
push:
branches:
- main
pull_request:

jobs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Docker
on:
workflow_dispatch:
push:
branches:
- main
pull_request:

env:
Expand Down

0 comments on commit 8d791af

Please sign in to comment.