Skip to content

Commit

Permalink
Merge pull request #652 from Kicer86/mergify
Browse files Browse the repository at this point in the history
Add mergify configuration
  • Loading branch information
Kicer86 committed Jun 7, 2024
2 parents 724af1b + b0c251f commit ffa1f4d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/windows-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
VCPKG_OVERLAY_PORTS: .github/vcpkg_overlays/qt

jobs:
build:
windows-build:
runs-on: windows-2022
strategy:
fail-fast: false
Expand Down
25 changes: 25 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
pull_request_rules:
- name: Squash and merge (one commit)
conditions:
- check-success=build (ubuntu-24.04)
- check-success=windows-build
- "#commits=1"
- or:
- "#approved-reviews-by>0"
- author=Kicer86
actions:
merge:
method: squash

- name: Merge pull request (more than one commit)
conditions:
- check-success=build (ubuntu-24.04)
- check-success=windows-build
- "#commits>1"
- "#commits-behind=0"
- or:
- "#approved-reviews-by>0"
- author=Kicer86
actions:
merge:
method: merge

0 comments on commit ffa1f4d

Please sign in to comment.