Skip to content

Commit 9a47e75

Browse files
authored
CI: Replace push triggers with merge_group in workflow files (#34108)
1 parent 6182090 commit 9a47e75

15 files changed

Lines changed: 18 additions & 32 deletions

.github/workflows/build_all.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ on:
44
pull_request:
55
paths-ignore:
66
- 'apps/**/*.md'
7-
push:
8-
branches: [26_1]
7+
merge_group:
98
workflow_dispatch:
109
inputs:
1110
SBOM:
@@ -62,15 +61,15 @@ jobs:
6261
retention-days: 1
6362

6463
- name: Build SBOMs
65-
if: ${{ github.event_name == 'push' || github.event.inputs.SBOM == 'true' }}
64+
if: ${{ github.event.inputs.SBOM == 'true' }}
6665
env:
6766
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6867
run: |
6968
pnpm set //npm.pkg.github.com/:_authToken="$NODE_AUTH_TOKEN";
7069
pnpm nx build sbom;
7170
7271
- name: Upload SBOM artifacts
73-
if: ${{ github.event_name == 'push' || github.event.inputs.SBOM == 'true' }}
72+
if: ${{ github.event.inputs.SBOM == 'true' }}
7473
uses: actions/upload-artifact@v7
7574
with:
7675
name: sbom

.github/workflows/default_workflow.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches:
13-
- "[0-9][0-9]_[0-9]"
11+
merge_group:
1412

1513
env:
1614
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}

.github/workflows/demos_unit_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312
workflow_dispatch:
1413

1514
env:

.github/workflows/lint.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312

1413
env:
1514
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}

.github/workflows/paths.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312

1413
env:
1514
MAX_LENGTH: 170

.github/workflows/playgrounds_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312

1413
env:
1514
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}

.github/workflows/qunit_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312
workflow_dispatch:
1413

1514
env:

.github/workflows/renovation.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312

1413
env:
1514
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}

.github/workflows/styles.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312

1413
env:
1514
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}

.github/workflows/testcafe_tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
pull_request:
99
paths-ignore:
1010
- 'apps/**/*.md'
11-
push:
12-
branches: [26_1]
11+
merge_group:
1312
workflow_dispatch:
1413

1514
env:

0 commit comments

Comments
 (0)