From e74e146b4cacb3542d21a1e3283218d01c5f0de5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 7 Apr 2026 17:59:50 +0100
Subject: [PATCH] Add workaround for cla-assistant being flaky wedging merge
 queue (#33033)

---
 .github/workflows/merge-queue.yaml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/merge-queue.yaml

diff --git a/.github/workflows/merge-queue.yaml b/.github/workflows/merge-queue.yaml
new file mode 100644
index 0000000000..1e4d7d3ede
--- /dev/null
+++ b/.github/workflows/merge-queue.yaml
@@ -0,0 +1,29 @@
+# Tweaks the behaviour of Merge Queue to skip certain checks
+name: Merge Queue tweaks
+on:
+    merge_group:
+        types: [checks_requested]
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
+    cancel-in-progress: true
+
+permissions: {}
+
+jobs:
+    run:
+        runs-on: ubuntu-24.04
+        permissions:
+            statuses: write
+        steps:
+            # This is only needed as license/cla at time of writing seems to be extraordinarily flaky
+            # and Github doesn't support conditional checks between PR & merge queue.
+            # This is fine to do as a PR won't make it to merge queue until it has license/cla passing.
+            - name: Skip license/cla on merge queues
+              uses: guibranco/github-status-action-v2@9bfa8773cdbdc6c185747fd43cd7faa9d7c32f09
+              with:
+                  authToken: ${{ secrets.GITHUB_TOKEN }}
+                  state: success
+                  context: license/cla
+                  sha: ${{ github.sha }}
+                  target_url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}