Skip to content

Commit

Permalink
Mergify config
Browse files Browse the repository at this point in the history
  • Loading branch information
tyhal committed Jun 29, 2021
1 parent c9f40fb commit a692dbe
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
22 changes: 13 additions & 9 deletions .mergify.yml → .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,44 @@
queue_rules:
- name: default
conditions:
- status-success=Docker / test (pull_request)
- check-success=docker-build / test

pull_request_rules:
- name: automatic merge for Dependabot pull requests
conditions:
- base=master
- base=main
- author~=^dependabot(|-preview)\[bot\]$
- status-success=Docker / test (pull_request)
- status-success=docker-build / docker-build-test
- status-success=docker-build-test
actions:
queue:
name: default
- name: automatic merge for Renovate pull requests
conditions:
- base=master
- base=main
- author=renovate[bot]
- status-success=Docker / test (pull_request)
- status-success=docker-build / docker-build-test
- status-success=docker-build-test
actions:
queue:
name: default
- name: automatic merge for Synk pull requests
conditions:
- base=master
- base=main
- title~=^\[Snyk\]
- head~=^snyk-fix
- check-success~=^security/snyk
- status-success=Docker / test (pull_request)
- status-success=docker-build / docker-build-test
- status-success=docker-build-test
actions:
queue:
name: default
- name: automatic merge for ImgBot pull requests
conditions:
- base=master
- base=main
- author=imgbot[bot]
- status-success=Docker / test (pull_request)
- status-success=docker-build / docker-build-test
- status-success=docker-build-test
actions:
queue:
name: default
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Docker
name: docker-build

on:
push:
Expand All @@ -16,7 +16,7 @@ on:

jobs:

test:
docker-build-test:
runs-on: ubuntu-latest
if: github.event_name == 'pull_request'

Expand Down

0 comments on commit a692dbe

Please sign in to comment.