Skip to content

Commit

Permalink
Merge pull request #735 from softwaremill/mergify-fix
Browse files Browse the repository at this point in the history
Fixed mergify to allow scala-steward auto-merges
  • Loading branch information
adamw authored Dec 3, 2021
2 parents 7554baf + 9fd779d commit f5be852
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pull_request_rules:
- name: automatic merge for scala-steward pull requests affecting build.sbt
conditions:
- author=scala-steward
- status-success=Bootzooka CI
- check-success=Bootzooka CI
- "#files=1"
- files=build.sbt
actions:
Expand All @@ -15,7 +15,7 @@ pull_request_rules:
- name: automatic merge for scala-steward pull requests affecting project plugins.sbt
conditions:
- author=scala-steward
- status-success=Bootzooka CI
- check-success=Bootzooka CI
- "#files=1"
- files=project/plugins.sbt
actions:
Expand All @@ -24,15 +24,15 @@ pull_request_rules:
- name: semi-automatic merge for scala-steward pull requests
conditions:
- author=scala-steward
- status-success=Bootzooka CI
- check-success=Bootzooka CI
- "#approved-reviews-by>=1"
actions:
merge:
method: merge
- name: automatic merge for scala-steward pull requests affecting project build.properties
conditions:
- author=scala-steward
- status-success=Bootzooka CI
- check-success=Bootzooka CI
- "#files=1"
- files=project/build.properties
actions:
Expand All @@ -41,7 +41,7 @@ pull_request_rules:
- name: automatic merge for scala-steward pull requests affecting .scalafmt.conf
conditions:
- author=scala-steward
- status-success=Bootzooka CI
- check-success=Bootzooka CI
- "#files=1"
- files=.scalafmt.conf
actions:
Expand Down

0 comments on commit f5be852

Please sign in to comment.