Skip to content

Commit f7e35b2

Browse files
committed
chore(ci): skip post-merge test run
1 parent 2f86caa commit f7e35b2

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

.github/workflows/test.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ name: Test
33
# Release-notes PRs (head ref `release-notes/*`) only add markdown under
44
# `release-notes/` and are published via approval — skip the full CI suite.
55
on:
6-
push:
7-
branches:
8-
- develop
96
pull_request:
107
types:
118
- opened
@@ -32,8 +29,7 @@ jobs:
3229
check:
3330
if: |
3431
!startsWith(github.head_ref, 'release-notes/') &&
35-
(github.event_name == 'push' ||
36-
github.event_name == 'merge_group' ||
32+
(github.event_name == 'merge_group' ||
3733
github.event.pull_request.draft == false)
3834
name: Check code quality
3935
runs-on: blacksmith-8vcpu-ubuntu-2404
@@ -62,8 +58,7 @@ jobs:
6258
test-core:
6359
if: |
6460
!startsWith(github.head_ref, 'release-notes/') &&
65-
(github.event_name == 'push' ||
66-
github.event_name == 'merge_group' ||
61+
(github.event_name == 'merge_group' ||
6762
github.event.pull_request.draft == false)
6863
name: Run unit and integration tests
6964
runs-on: blacksmith-8vcpu-ubuntu-2404
@@ -92,8 +87,7 @@ jobs:
9287
test-e2e:
9388
if: |
9489
!startsWith(github.head_ref, 'release-notes/') &&
95-
(github.event_name == 'push' ||
96-
github.event_name == 'merge_group' ||
90+
(github.event_name == 'merge_group' ||
9791
github.event.pull_request.draft == false)
9892
name: Run end-to-end tests (shard ${{ matrix.shard }}/3)
9993
runs-on: blacksmith-8vcpu-ubuntu-2404
@@ -121,15 +115,11 @@ jobs:
121115
uses: ./.github/actions/setup
122116

123117
# Detect which e2e suites should run. On PR and merge queue runs we
124-
# honour `nx affected`; on push we run every `test:e2e` target.
118+
# honour `nx affected` using the event-specific base and head SHAs.
125119
- name: Detect affected e2e projects
126120
id: detect
127121
run: |
128-
if [ "${{ github.event_name }}" = "pull_request" ] || [ "${{ github.event_name }}" = "merge_group" ]; then
129-
affected=$(pnpm exec nx show projects --affected --withTarget test:e2e --json | jq -r '.[]')
130-
else
131-
affected=$(pnpm exec nx show projects --withTarget test:e2e --json | jq -r '.[]')
132-
fi
122+
affected=$(pnpm exec nx show projects --affected --withTarget test:e2e --json | jq -r '.[]')
133123
echo "Affected e2e projects:"
134124
echo "$affected"
135125
cli=false
@@ -200,8 +190,7 @@ jobs:
200190
if: |
201191
always() &&
202192
!startsWith(github.head_ref, 'release-notes/') &&
203-
(github.event_name == 'push' ||
204-
github.event_name == 'merge_group' ||
193+
(github.event_name == 'merge_group' ||
205194
github.event.pull_request.draft == false)
206195
name: Run end-to-end tests
207196
needs: test-e2e

0 commit comments

Comments
 (0)