diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 1f6e4e3719..5063ee3180 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -11,7 +11,7 @@ env: VCPKG_OVERLAY_PORTS: .github/vcpkg_overlays/qt jobs: - build: + windows-build: runs-on: windows-2022 strategy: fail-fast: false diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000000..311ab2aa51 --- /dev/null +++ b/.mergify.yml @@ -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