Skip to content

Commit

Permalink
Fix auto-merge (#547)
Browse files Browse the repository at this point in the history
* Fix auto-merge

* Update .mergify.yml

* Update .mergify.yml

* Update auto-approve.yml
  • Loading branch information
svroonland authored Nov 19, 2022
1 parent 19f6ae5 commit 0af8773
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
auto-approve:
runs-on: ubuntu-20.04
steps:
- uses: hmarr/auto-approve-action@v2.0.0
- uses: hmarr/auto-approve-action@v3.1.0
if: github.actor == 'scala-steward'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
14 changes: 10 additions & 4 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,21 @@ pull_request_rules:
- author=scala-steward
actions:
assign:
users: [iravid]
users: ["@zio/zio-kafka"]
label:
add: [dependency-update]

add: ["type: dependencies"]
- name: label scala-steward's breaking PRs
conditions:
- author=scala-steward
- "body~=(labels: library-update, semver-major)|(labels: sbt-plugin-update, semver-major)"
actions:
label:
add: ["type: breaking"]
- name: merge Scala Steward's PRs
conditions:
- base=master
- author=scala-steward
- "body~=(labels: library-update, semver-minor)|(labels: library-update, semver-patch)|(labels: sbt-plugin-update, semver-minor)|(labels: sbt-plugin-update, semver-patch)|(labels: scalafix-rule-update, semver-minor)|(labels: scalafix-rule-update, semver-patch)|(labels: test-library-update, semver-minor)|(labels: test-library-update, semver-patch)"
- "body~=(labels: library-update, semver-minor)|(labels: library-update, semver-patch)|(labels: sbt-plugin-update, semver-minor)|(labels: sbt-plugin-update, semver-patch)|(labels: scalafix-rule-update)|(labels: test-library-update)"
- "status-success=license/cla"
- "status-success=lint"
- "status-success=test (8, 2.12.15)"
Expand Down

0 comments on commit 0af8773

Please sign in to comment.