Skip to content

Commit b94f652

Browse files
authored
ci: Ensure CI uses correct node version & bump pnpm to latest v9 (#16645)
Extracted this out of #16644, for clarity
1 parent 57256ad commit b94f652

File tree

4 files changed

+10
-26
lines changed

4 files changed

+10
-26
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,6 @@ jobs:
415415
if: needs.job_build.outputs.changed_bun == 'true' || github.event_name != 'pull_request'
416416
timeout-minutes: 10
417417
runs-on: ubuntu-24.04
418-
strategy:
419-
fail-fast: false
420418
steps:
421419
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
422420
uses: actions/checkout@v4
@@ -442,8 +440,6 @@ jobs:
442440
if: needs.job_build.outputs.changed_deno == 'true' || github.event_name != 'pull_request'
443441
timeout-minutes: 10
444442
runs-on: ubuntu-24.04
445-
strategy:
446-
fail-fast: false
447443
steps:
448444
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
449445
uses: actions/checkout@v4
@@ -475,7 +471,7 @@ jobs:
475471
strategy:
476472
fail-fast: false
477473
matrix:
478-
node: [18, 20, 22, '^24.0.1']
474+
node: [18, 20, 22, 24]
479475
steps:
480476
- name: Check out base commit (${{ github.event.pull_request.base.sha }})
481477
uses: actions/checkout@v4
@@ -885,18 +881,11 @@ jobs:
885881
ref: ${{ env.HEAD_COMMIT }}
886882
- uses: pnpm/action-setup@v4
887883
with:
888-
version: 9.4.0
889-
# TODO: Remove this once the repo is bumped to 20.19.2 or higher
890-
- name: Set up Node for Angular 20
891-
if: matrix.test-application == 'angular-20'
892-
uses: actions/setup-node@v4
893-
with:
894-
node-version: '20.19.2'
884+
version: 9.15.9
895885
- name: Set up Node
896-
if: matrix.test-application != 'angular-20'
897886
uses: actions/setup-node@v4
898887
with:
899-
node-version-file: 'dev-packages/e2e-tests/package.json'
888+
node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
900889
- name: Set up Bun
901890
if: matrix.test-application == 'node-exports-test-app'
902891
uses: oven-sh/setup-bun@v2
@@ -1012,11 +1001,11 @@ jobs:
10121001
ref: ${{ env.HEAD_COMMIT }}
10131002
- uses: pnpm/action-setup@v4
10141003
with:
1015-
version: 9.4.0
1004+
version: 9.15.9
10161005
- name: Set up Node
10171006
uses: actions/setup-node@v4
10181007
with:
1019-
node-version-file: 'dev-packages/e2e-tests/package.json'
1008+
node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
10201009
- name: Restore caches
10211010
uses: ./.github/actions/restore-cache
10221011
with:

.github/workflows/canary.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,12 @@ jobs:
125125
ref: ${{ env.HEAD_COMMIT }}
126126
- uses: pnpm/action-setup@v4
127127
with:
128-
version: 9.4.0
129-
# TODO: Remove this once the repo is bumped to 20.19.2 or higher
130-
- name: Set up Node for Angular 20
131-
if: matrix.test-application == 'angular-20'
132-
uses: actions/setup-node@v4
133-
with:
134-
node-version: '20.19.2'
128+
version: 9.15.9
135129
- name: Set up Node
136130
if: matrix.test-application != 'angular-20'
137131
uses: actions/setup-node@v4
138132
with:
139-
node-version-file: 'dev-packages/e2e-tests/package.json'
133+
node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
140134

141135
- name: Restore canary cache
142136
uses: actions/cache/restore@v4

dev-packages/e2e-tests/test-applications/angular-20/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"typescript": "~5.8.3"
4747
},
4848
"volta": {
49-
"extends": "../../package.json"
49+
"extends": "../../package.json",
50+
"node": "20.19.2"
5051
}
5152
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"volta": {
4747
"node": "20.18.2",
4848
"yarn": "1.22.22",
49-
"pnpm": "9.15.0"
49+
"pnpm": "9.15.9"
5050
},
5151
"workspaces": [
5252
"packages/angular",

0 commit comments

Comments
 (0)