From 5558e6e23c0996aa8dc04aeee9d022ad2d7af607 Mon Sep 17 00:00:00 2001 From: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com> Date: Wed, 19 Nov 2025 21:43:26 -0800 Subject: [PATCH 1/2] Decrease sleep duration in Expensive Test job Reduced sleep time for the Expensive Test job in the merge queue workflow. --- .github/workflows/merge-queue-demo.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/merge-queue-demo.yaml b/.github/workflows/merge-queue-demo.yaml index b8d90b5..60f0065 100644 --- a/.github/workflows/merge-queue-demo.yaml +++ b/.github/workflows/merge-queue-demo.yaml @@ -5,7 +5,6 @@ on: pull_request: branches: [main] merge_group: - branches: [main] jobs: unit-test: @@ -22,7 +21,7 @@ jobs: steps: - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - name: Run Expensive Test - run: ./scripts/test.sh sleep 10 + run: ./scripts/test.sh sleep 2 # Scenario: Job that only runs on PRs (e.g., quick linting, or checks not needed for merge) pr-exclusive: From 7b502959f04bd03f3bd8f3cb40961b152b4d6150 Mon Sep 17 00:00:00 2001 From: Dariusz Porowski <3431813+DariuszPorowski@users.noreply.github.com> Date: Wed, 19 Nov 2025 21:48:53 -0800 Subject: [PATCH 2/2] Modify test script calls in merge queue workflow Updated test script calls to run without fail conditions. --- .github/workflows/merge-queue-demo.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-queue-demo.yaml b/.github/workflows/merge-queue-demo.yaml index 60f0065..54f3aea 100644 --- a/.github/workflows/merge-queue-demo.yaml +++ b/.github/workflows/merge-queue-demo.yaml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 - name: Run Unit Test - run: ./scripts/test.sh fail + run: ./scripts/test.sh # Scenario: Job that only runs in the Merge Queue (e.g., expensive integration tests) merge-queue-exclusive: @@ -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.