Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/merge-queue-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ on:
pull_request:
branches: [main]
merge_group:
branches: [main]

jobs:
unit-test:
runs-on: ubuntu-latest
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:
Expand All @@ -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:
Expand All @@ -47,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.
Expand Down