From 15a2f9ea3b6f041eaf29ac40b0b6842213f5ce3a Mon Sep 17 00:00:00 2001 From: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com> Date: Wed, 19 Nov 2025 21:55:01 -0800 Subject: [PATCH 1/3] Change test script to simulate failure --- .github/workflows/merge-queue-demo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-queue-demo.yaml b/.github/workflows/merge-queue-demo.yaml index c623d9b..19b41eb 100644 --- a/.github/workflows/merge-queue-demo.yaml +++ b/.github/workflows/merge-queue-demo.yaml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - name: Run Expensive Test - run: ./scripts/test.sh sleep 5 + run: ./scripts/test.sh fail # Scenario: Job that only runs on PRs (e.g., quick linting, or checks not needed for merge) pr-exclusive: From 32a7e1b447e748bbb6e84ec21427626f10458845 Mon Sep 17 00:00:00 2001 From: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com> Date: Wed, 19 Nov 2025 22:08:50 -0800 Subject: [PATCH 2/3] Change test script to sleep for 5 seconds --- .github/workflows/merge-queue-demo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-queue-demo.yaml b/.github/workflows/merge-queue-demo.yaml index 19b41eb..c623d9b 100644 --- a/.github/workflows/merge-queue-demo.yaml +++ b/.github/workflows/merge-queue-demo.yaml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - name: Run Expensive Test - run: ./scripts/test.sh fail + run: ./scripts/test.sh sleep 5 # Scenario: Job that only runs on PRs (e.g., quick linting, or checks not needed for merge) pr-exclusive: From 4a2bdff224759d13c2f8dc1d4e81d649261a9075 Mon Sep 17 00:00:00 2001 From: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com> Date: Wed, 19 Nov 2025 22:09:05 -0800 Subject: [PATCH 3/3] Update test script to run without flakiness Changed test script execution from 'flaky' to 'pass'. --- .github/workflows/merge-queue-demo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-queue-demo.yaml b/.github/workflows/merge-queue-demo.yaml index c623d9b..e646611 100644 --- a/.github/workflows/merge-queue-demo.yaml +++ b/.github/workflows/merge-queue-demo.yaml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - name: Run Flaky Test # Change 'pass' to 'flaky' to simulate flakiness - run: ./scripts/test.sh flaky + run: ./scripts/test.sh pass # Scenario: Semantic Conflict Simulation # This job checks a version file. If two PRs change it incompatibly, this fails.