From 9617169ab6186170ac46477c7d9c4e9142332a84 Mon Sep 17 00:00:00 2001
From: Patrick Weyck <p.weyck@shopware.com>
Date: Fri, 17 Jan 2025 14:19:31 +0100
Subject: [PATCH] chore(ci): enable merge queues

---
 .github/workflows/downstream.yml  |  1 +
 .github/workflows/integration.yml | 11 ++++++++++-
 test                              |  0
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 test

diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml
index e111995fc8b..1aa6b54ee12 100644
--- a/.github/workflows/downstream.yml
+++ b/.github/workflows/downstream.yml
@@ -1,6 +1,7 @@
 name: Downstream
 
 on:
+  merge_group:
   workflow_dispatch:
     inputs:
       nightly:
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index a084d1e0ea8..924a78ded6f 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -2,6 +2,7 @@ name: Integration tests
 
 on:
   pull_request:
+  merge_group:
   workflow_dispatch:
     inputs:
       nightly:
@@ -15,6 +16,7 @@ on:
 jobs:
   acceptance:
     runs-on: ubuntu-24.04
+    if: ${{ github.event_name != 'pull_request' }}
     strategy:
       fail-fast: false
       matrix:
@@ -134,6 +136,7 @@ jobs:
 
   phpunit-matrix:
     runs-on: ubuntu-24.04
+    if: ${{ github.event_name != 'pull_request' }}
     outputs:
       matrix: ${{ steps.generate-matrix.outputs.matrix }}
     steps: 
@@ -149,6 +152,7 @@ jobs:
 
   phpunit:
     name: "${{ matrix.php}} ${{ matrix.test.testsuite }}${{ matrix.test.path }} ${{ matrix.db }}"
+    if: ${{ github.event_name != 'pull_request' }}
     needs: 
       - phpunit-matrix
     runs-on: ubuntu-24.04
@@ -204,6 +208,7 @@ jobs:
 
   win-checkout:
     runs-on: windows-latest
+    if: ${{ github.event_name != 'pull_request' }}
     name: "Windows check"
 
     steps:
@@ -311,6 +316,7 @@ jobs:
   tested-update-versions:
     name: tested-versions
     runs-on: ubuntu-24.04
+    if: ${{ github.event_name != 'pull_request' }}
     outputs:
       first-version: ${{ steps.versions.outputs.first-version }}
       latest-version: ${{ steps.versions.outputs.latest-version }}
@@ -324,6 +330,7 @@ jobs:
   acceptance-update:
     needs: tested-update-versions
     runs-on: ubuntu-24.04
+    if: ${{ github.event_name != 'pull_request' }}
     strategy:
       fail-fast: false
       matrix:
@@ -427,6 +434,7 @@ jobs:
   blue-green-66-67:
     name: "PHP blue green 6.6 -> 6.7 -> 6.6"
     runs-on: ubuntu-24.04
+    if: ${{ github.event_name != 'pull_request' }}
     env:
       APP_ENV: test
       APP_URL: http://localhost:8000
@@ -497,5 +505,6 @@ jobs:
       uses: re-actors/alls-green@release/v1
       with:
         # allowed-failures: docs, linters
-        # allowed-skips: non-voting-flaky-job
+        # allow all jobs to be skipped in case of a PR run
+        allowed-skips: ${{ toJSON('["acceptance", "phpunit", "win-checkout", "code-ql", "acceptance-update", "blue-green-66-67"]') }}
         jobs: ${{ toJSON(needs) }}
\ No newline at end of file
diff --git a/test b/test
new file mode 100644
index 00000000000..e69de29bb2d