Skip to content

Commit 807b72a

Browse files
committed
fix: exclude merge_group events from full-tier CI jobs
The e2e-full, yarn-berry-full, and cargo-vex-matrix-full jobs should skip merge_group events (GitHub's merge queue) along with pull_request events. These jobs run the nightly full matrices and should not run in the merge queue, which is intended to use the same PR-tier job set. Changed the condition from 'github.event_name != pull_request' to explicitly exclude both pull_request and merge_group events, preventing ~40 extra test legs from running in the merge queue.
1 parent c5eeff8 commit 807b72a

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1699,7 +1699,7 @@ jobs:
16991699
# v5 landings, the nightly schedule and dispatch run them with the `e2e`
17001700
# steps.
17011701
e2e-full:
1702-
if: github.event_name != 'pull_request' || github.head_ref == 'release/v5-prerelease'
1702+
if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') || github.head_ref == 'release/v5-prerelease'
17031703
needs: [test, coverage, e2e-build]
17041704
strategy:
17051705
fail-fast: false
@@ -1920,7 +1920,7 @@ jobs:
19201920
# Skipped on pull_request (except v5 landings), like e2e-full.
19211921
yarn-berry-full:
19221922
name: yarn-berry ${{ matrix.yarn }} (${{ matrix.os }})
1923-
if: github.event_name != 'pull_request' || github.head_ref == 'release/v5-prerelease'
1923+
if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') || github.head_ref == 'release/v5-prerelease'
19241924
needs: [test, coverage]
19251925
strategy:
19261926
fail-fast: false
@@ -2012,7 +2012,7 @@ jobs:
20122012
20132013
cargo-vex-matrix-full:
20142014
name: cargo ${{ matrix.toolchain }} lock-v${{ matrix.lock || 'own' }} (${{ matrix.os }})
2015-
if: github.event_name != 'pull_request' || github.head_ref == 'release/v5-prerelease'
2015+
if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') || github.head_ref == 'release/v5-prerelease'
20162016
needs: [test, coverage, e2e-build]
20172017
runs-on: ${{ matrix.os }}
20182018
timeout-minutes: 40

0 commit comments

Comments
 (0)