From 736e28c259ccbf7193fb39d5bfb7b4615e7379ef Mon Sep 17 00:00:00 2001 From: Michael Swan <10856729+RMichaelSwan@users.noreply.github.com> Date: Tue, 5 May 2026 17:39:52 -0500 Subject: [PATCH 1/3] failing merge queue --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b392587831481..62831102f554b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,8 +10,10 @@ jobs: runs-on: ubuntu-slim steps: - name: Checkout code + if: github.event_name == 'pull_request' uses: actions/checkout@v3 - name: Display info + if: github.event_name == 'pull_request' run: | echo "pull request!" pwd @@ -24,4 +26,4 @@ jobs: if: ${{ github.event_name == 'merge_group' }} run: | echo "Merge group!" - exit 0 + exit 1 From 6c93023ad2cd4cd0c8efc663e7c45f9a4232095a Mon Sep 17 00:00:00 2001 From: Michael Swan <10856729+RMichaelSwan@users.noreply.github.com> Date: Tue, 5 May 2026 17:45:34 -0500 Subject: [PATCH 2/3] Delete .github/workflows/queue.yml --- .github/workflows/queue.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/workflows/queue.yml diff --git a/.github/workflows/queue.yml b/.github/workflows/queue.yml deleted file mode 100644 index c37ab5a465716..0000000000000 --- a/.github/workflows/queue.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Validate queue - -on: - merge_group: - -jobs: - - validate-queue: - runs-on: ubuntu-slim - steps: - - name: Checkout code - uses: actions/checkout@v3 - - name: Display info - run: | - echo "merge queue check!!" - pwd - tree -a -I '.git' - git status - - name: Run fast CI (emulated by a short sleep) - run: | - exit 1 - sleep 30 From 84de0e7eb883d88760389fd8c36876cf37f94365 Mon Sep 17 00:00:00 2001 From: Michael Swan <10856729+RMichaelSwan@users.noreply.github.com> Date: Tue, 5 May 2026 17:45:48 -0500 Subject: [PATCH 3/3] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62831102f554b..96d01b1391804 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,4 +26,4 @@ jobs: if: ${{ github.event_name == 'merge_group' }} run: | echo "Merge group!" - exit 1 + exit 0