Skip to content

Commit 7fa2ec1

Browse files
Merge branch 'actions:main' into main
2 parents 1c26a09 + a0853c2 commit 7fa2ec1

21 files changed

Lines changed: 295 additions & 118 deletions

.github/workflows/basic-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ jobs:
1616
name: Basic validation
1717
uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
1818
with:
19-
node-version: '20.x'
19+
node-version: '24.x'

.github/workflows/e2e-cache.yml

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
22-
node-version: [18, 20, 22]
22+
node-version: [18, 20, 22, 24]
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- name: Clean global cache
2626
run: npm cache clean --force
2727
- name: Setup Node
@@ -42,9 +42,9 @@ jobs:
4242
fail-fast: false
4343
matrix:
4444
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
45-
node-version: [18, 20, 22]
45+
node-version: [18, 20, 22, 24]
4646
steps:
47-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v5
4848
- name: Install pnpm
4949
uses: pnpm/action-setup@v4
5050
with:
@@ -75,13 +75,13 @@ jobs:
7575
fail-fast: false
7676
matrix:
7777
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
78-
node-version: [18, 20]
78+
node-version: [18, 20, 24]
7979
steps:
80-
- uses: actions/checkout@v4
80+
- uses: actions/checkout@v5
8181
- name: Yarn version
8282
run: yarn --version
8383
- name: Generate yarn file
84-
run: yarn install
84+
run: yarn install --ignore-engines
8585
- name: Remove dependencies
8686
shell: pwsh
8787
run: Remove-Item node_modules -Force -Recurse
@@ -107,9 +107,9 @@ jobs:
107107
fail-fast: false
108108
matrix:
109109
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
110-
node-version: [18, 20, 22]
110+
node-version: [18, 20, 22, 24]
111111
steps:
112-
- uses: actions/checkout@v4
112+
- uses: actions/checkout@v5
113113
- name: Update yarn
114114
run: yarn set version 3.6.4
115115
- name: Yarn version
@@ -139,11 +139,11 @@ jobs:
139139
name: Test yarn subprojects
140140
strategy:
141141
matrix:
142-
node-version: [18, 20, 22]
142+
node-version: [18, 20, 22, 24]
143143
runs-on: ubuntu-latest
144144

145145
steps:
146-
- uses: actions/checkout@v4
146+
- uses: actions/checkout@v5
147147

148148
- name: prepare sub-projects
149149
run: __tests__/prepare-yarn-subprojects.sh yarn1
@@ -166,11 +166,11 @@ jobs:
166166
name: Test yarn subprojects all locally managed
167167
strategy:
168168
matrix:
169-
node-version: [18, 20, 22]
169+
node-version: [18, 20, 22, 24]
170170
runs-on: ubuntu-latest
171171

172172
steps:
173-
- uses: actions/checkout@v4
173+
- uses: actions/checkout@v5
174174

175175
- name: prepare sub-projects
176176
run: __tests__/prepare-yarn-subprojects.sh keepcache keepcache
@@ -193,11 +193,11 @@ jobs:
193193
name: Test yarn subprojects some locally managed
194194
strategy:
195195
matrix:
196-
node-version: [18, 20, 22]
196+
node-version: [18, 20, 22, 24]
197197
runs-on: ubuntu-latest
198198

199199
steps:
200-
- uses: actions/checkout@v4
200+
- uses: actions/checkout@v5
201201

202202
- name: prepare sub-projects
203203
run: __tests__/prepare-yarn-subprojects.sh global
@@ -220,11 +220,11 @@ jobs:
220220
name: Test yarn subprojects managed by git
221221
strategy:
222222
matrix:
223-
node-version: [18, 20, 22]
223+
node-version: [18, 20, 22, 24]
224224
runs-on: ubuntu-latest
225225

226226
steps:
227-
- uses: actions/checkout@v4
227+
- uses: actions/checkout@v5
228228

229229
- name: prepare sub-projects
230230
run: /bin/bash __tests__/prepare-yarn-subprojects.sh keepcache
@@ -243,3 +243,28 @@ jobs:
243243
cache-dependency-path: |
244244
sub2/*.lock
245245
sub3/*.lock
246+
247+
node-npm-package-manager-cache:
248+
name: Test enabling cache if package manager field is present (Node ${{ matrix.node-version }}, ${{ matrix.os }})
249+
runs-on: ${{ matrix.os }}
250+
strategy:
251+
fail-fast: false
252+
matrix:
253+
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
254+
node-version: [18, 20, 22]
255+
steps:
256+
- uses: actions/checkout@v5
257+
- name: Create package.json with packageManager field
258+
run: |
259+
echo '{ "name": "test-project", "version": "1.0.0", "packageManager": "[email protected]" }' > package.json
260+
- name: Clean global cache
261+
run: npm cache clean --force
262+
- name: Setup Node with caching enabled
263+
uses: ./
264+
with:
265+
node-version: ${{ matrix.node-version }}
266+
- name: Install dependencies
267+
run: npm install
268+
- name: Verify node and npm
269+
run: __tests__/verify-node.sh "${{ matrix.node-version }}"
270+
shell: bash

.github/workflows/proxy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
env:
2626
https_proxy: http://squid-proxy:3128
2727
steps:
28-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2929
- name: Clear tool cache
3030
run: rm -rf $RUNNER_TOOL_CACHE/*
3131
- name: Setup node 14
@@ -41,7 +41,7 @@ jobs:
4141
https_proxy: http://no-such-proxy:3128
4242
no_proxy: api.github.com,github.com,nodejs.org,registry.npmjs.org,*.s3.amazonaws.com,s3.amazonaws.com
4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
- name: Clear tool cache
4646
run: rm -rf $RUNNER_TOOL_CACHE/*
4747
- name: Setup node 11

.github/workflows/publish-immutable-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checking out
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v5
1818
- name: Publish
1919
id: publish
2020
uses: actions/[email protected]

.github/workflows/versions.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
21-
node-version: [18, 20, 22]
21+
node-version: [18, 20, 22, 24]
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- name: Setup Node
2525
uses: ./
2626
with:
@@ -37,7 +37,7 @@ jobs:
3737
os: [ubuntu-latest, windows-latest, macos-13]
3838
node-version: [lts/dubnium, lts/erbium, lts/fermium, lts/*, lts/-1]
3939
steps:
40-
- uses: actions/checkout@v4
40+
- uses: actions/checkout@v5
4141
- name: Setup Node
4242
uses: ./
4343
with:
@@ -64,7 +64,7 @@ jobs:
6464
'20.0.0-v8-canary20221101e50e45c9f8'
6565
]
6666
steps:
67-
- uses: actions/checkout@v4
67+
- uses: actions/checkout@v5
6868
- name: Setup Node
6969
uses: ./
7070
with:
@@ -84,7 +84,7 @@ jobs:
8484
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
8585
node-version: [20-nightly, 21-nightly, 18.0.0-nightly]
8686
steps:
87-
- uses: actions/checkout@v4
87+
- uses: actions/checkout@v5
8888
- name: Setup Node
8989
uses: ./
9090
with:
@@ -104,7 +104,7 @@ jobs:
104104
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
105105
node-version: [20.0.0-rc.1, 18.0.0-rc.2, 19.0.0-rc.0]
106106
steps:
107-
- uses: actions/checkout@v4
107+
- uses: actions/checkout@v5
108108
- name: Setup Node
109109
uses: ./
110110
with:
@@ -124,7 +124,7 @@ jobs:
124124
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
125125
node-version: [18.20.0, 20.10.0, 22.0.0]
126126
steps:
127-
- uses: actions/checkout@v4
127+
- uses: actions/checkout@v5
128128
- name: Setup Node
129129
uses: ./
130130
with:
@@ -139,9 +139,9 @@ jobs:
139139
fail-fast: false
140140
matrix:
141141
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
142-
node-version: [18, 20, 22]
142+
node-version: [18, 20, 22, 24]
143143
steps:
144-
- uses: actions/checkout@v4
144+
- uses: actions/checkout@v5
145145
- name: Setup Node and check latest
146146
uses: ./
147147
with:
@@ -160,13 +160,13 @@ jobs:
160160
node-version-file:
161161
[.nvmrc, .tool-versions, .tool-versions-node, package.json]
162162
steps:
163-
- uses: actions/checkout@v4
163+
- uses: actions/checkout@v5
164164
- name: Setup node from node version file
165165
uses: ./
166166
with:
167167
node-version-file: '__tests__/data/${{ matrix.node-version-file }}'
168168
- name: Verify node
169-
run: __tests__/verify-node.sh 20
169+
run: __tests__/verify-node.sh 24
170170

171171
version-file-volta:
172172
runs-on: ${{ matrix.os }}
@@ -175,13 +175,13 @@ jobs:
175175
matrix:
176176
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
177177
steps:
178-
- uses: actions/checkout@v4
178+
- uses: actions/checkout@v5
179179
- name: Setup node from node version file
180180
uses: ./
181181
with:
182182
node-version-file: '__tests__/data/package-volta.json'
183183
- name: Verify node
184-
run: __tests__/verify-node.sh 20
184+
run: __tests__/verify-node.sh 24
185185

186186
version-file-volta-extends:
187187
runs-on: ${{ matrix.os }}
@@ -190,13 +190,13 @@ jobs:
190190
matrix:
191191
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
192192
steps:
193-
- uses: actions/checkout@v4
193+
- uses: actions/checkout@v5
194194
- name: Setup node from node version file
195195
uses: ./
196196
with:
197197
node-version-file: '__tests__/data/package-volta-extends.json'
198198
- name: Verify node
199-
run: __tests__/verify-node.sh 20
199+
run: __tests__/verify-node.sh 24
200200

201201
node-dist:
202202
runs-on: ${{ matrix.os }}
@@ -206,7 +206,7 @@ jobs:
206206
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
207207
node-version: [17, 19]
208208
steps:
209-
- uses: actions/checkout@v4
209+
- uses: actions/checkout@v5
210210
- name: Setup Node from dist
211211
uses: ./
212212
with:
@@ -222,7 +222,7 @@ jobs:
222222
matrix:
223223
os: [ubuntu-latest, windows-latest, macos-13]
224224
steps:
225-
- uses: actions/checkout@v4
225+
- uses: actions/checkout@v5
226226
# test old versions which didn't have npm and layout different
227227
- name: Setup node 0.12.18 from dist
228228
uses: ./
@@ -235,7 +235,7 @@ jobs:
235235
arch:
236236
runs-on: windows-latest
237237
steps:
238-
- uses: actions/checkout@v4
238+
- uses: actions/checkout@v5
239239
- name: Setup node 20 x86 from dist
240240
uses: ./
241241
with:
@@ -259,7 +259,7 @@ jobs:
259259
echo "LATEST_NODE_VERSION=$latestNodeVersion" >> $GITHUB_OUTPUT
260260
id: version
261261
shell: bash
262-
- uses: actions/checkout@v4
262+
- uses: actions/checkout@v5
263263
- name: Setup Node
264264
uses: ./
265265
with:

.licenses/npm/@types/node.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/undici-types.dep.yml

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)