Skip to content

Commit 1136e0e

Browse files
Merge branch 'main' into renovate/esbuild-0.x
2 parents e0a88de + 959e015 commit 1136e0e

33 files changed

+427
-164
lines changed

.github/workflows/benchmark.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ on:
1111

1212
jobs:
1313
benchmark:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@v4
1717

1818
- name: Setup Node.js environment
1919
uses: actions/setup-node@v4
2020
with:
21-
node-version: '*'
21+
node-version: '22'
2222
cache: 'npm'
2323
check-latest: true
2424

.github/workflows/fossa.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ defaults:
1212

1313
jobs:
1414
fossa:
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v4

.github/workflows/pre-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ on:
66
- releases/*/*/*
77
jobs:
88
prerelease:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
1414
- uses: actions/setup-node@v4
1515
with:
16-
node-version: '*'
16+
node-version: '22'
1717
check-latest: true
1818
registry-url: 'https://registry.npmjs.org'
1919
- name: Extract tag, version and package

.github/workflows/stalebot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55

66
jobs:
77
stale:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-24.04
99
steps:
1010
- uses: actions/[email protected]
1111
with:

.github/workflows/typescript-nudge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
name: TypeScript conversion nudge
1111
jobs:
1212
Nudge-to-convert-to-TypeScript-if-JavaScript-found:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414
steps:
1515
- uses: actions/checkout@v4
1616
with:

.github/workflows/workflow.yml

+14-36
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
merge_group:
99
jobs:
1010
e2e:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-24.04
1212
timeout-minutes: 60
1313
steps:
1414
# Sets an output parameter if this is a release PR
@@ -27,7 +27,7 @@ jobs:
2727
if: ${{ !steps.release-check.outputs.IS_RELEASE }}
2828
- uses: actions/setup-node@v4
2929
with:
30-
node-version: 18
30+
node-version: 22
3131
if: ${{ !steps.release-check.outputs.IS_RELEASE }}
3232
- name: Install dependencies
3333
run: npm ci
@@ -49,12 +49,13 @@ jobs:
4949
timeout-minutes: 30
5050
strategy:
5151
matrix:
52-
os: [ubuntu-latest, macOS-latest, windows-latest]
53-
node-version: ['*']
52+
os: [ubuntu-24.04, macos-14, windows-2022]
53+
node-version: ['22']
5454
# Must include the minimum deno version from the `DENO_VERSION_RANGE` constant in `node/bridge.ts`.
5555
deno-version: ['v1.39.0', 'v1.46.3']
5656
include:
57-
- os: ubuntu-latest
57+
- os: ubuntu-24.04
58+
# Earliest supported version
5859
node-version: '14.16.0'
5960
deno-version: 'v1.46.3'
6061
fail-fast: false
@@ -63,7 +64,7 @@ jobs:
6364
# https://github.com/actions/virtual-environments/issues/268
6465
- name: Increase open file limit
6566
run: sudo ulimit -Sn 65536
66-
if: "${{ matrix.os == 'macOS-latest' }}"
67+
if: "${{ matrix.os == 'macos-14' }}"
6768
- run: git config --global core.symlinks true
6869
# Sets an output parameter if this is a release PR
6970
- name: Check for release
@@ -121,56 +122,33 @@ jobs:
121122
timeout-minutes: 30
122123
strategy:
123124
matrix:
124-
os: [ubuntu-latest, macOS-latest, windows-latest]
125-
node-version: ['*']
125+
os: [ubuntu-24.04, macos-14, windows-2022]
126+
node-version: ['22']
126127
install-command: ['npm ci']
127128
machine: ['0', '1', '2', '3', '4']
128129
include:
129130
# We test on the oldest supported Node.js version, but only with a
130131
# single combination (Ubuntu)
131-
- os: ubuntu-latest
132+
- os: ubuntu-24.04
132133
node-version: '14.16.0'
133134
install-command: npm ci
134135
machine: '0'
135-
- os: ubuntu-latest
136+
- os: ubuntu-24.04
136137
node-version: '14.16.0'
137138
install-command: npm ci
138139
machine: '1'
139-
- os: ubuntu-latest
140+
- os: ubuntu-24.04
140141
node-version: '14.16.0'
141142
install-command: npm ci
142143
machine: '2'
143-
- os: ubuntu-latest
144+
- os: ubuntu-24.04
144145
node-version: '14.16.0'
145146
install-command: npm ci
146147
machine: '3'
147-
- os: ubuntu-latest
148+
- os: ubuntu-24.04
148149
node-version: '14.16.0'
149150
install-command: npm ci
150151
machine: '4'
151-
# The buildbot pins Netlify Build's dependencies, like `npm ci`.
152-
# But other consumers do not, like `npm install`.
153-
# So we test both.
154-
- os: ubuntu-latest
155-
node-version: '*'
156-
install-command: npm install --no-package-lock
157-
machine: '0'
158-
- os: ubuntu-latest
159-
node-version: '*'
160-
install-command: npm install --no-package-lock
161-
machine: '1'
162-
- os: ubuntu-latest
163-
node-version: '*'
164-
install-command: npm install --no-package-lock
165-
machine: '2'
166-
- os: ubuntu-latest
167-
node-version: '*'
168-
install-command: npm install --no-package-lock
169-
machine: '3'
170-
- os: ubuntu-latest
171-
node-version: '*'
172-
install-command: npm install --no-package-lock
173-
machine: '4'
174152
fail-fast: false
175153
steps:
176154
# Sets an output parameter if this is a release PR

.release-please-manifest.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"packages/build-info": "7.16.0",
3-
"packages/build": "29.57.0",
4-
"packages/edge-bundler": "12.3.0",
2+
"packages/build-info": "7.17.0",
3+
"packages/build": "29.58.0",
4+
"packages/edge-bundler": "12.3.1",
55
"packages/cache-utils": "5.2.0",
6-
"packages/config": "20.20.0",
6+
"packages/config": "20.21.0",
77
"packages/framework-info": "9.9.0",
8-
"packages/functions-utils": "5.3.0",
8+
"packages/functions-utils": "5.3.1",
99
"packages/git-utils": "5.2.0",
10-
"packages/headers-parser": "7.2.0",
10+
"packages/headers-parser": "7.3.0",
1111
"packages/js-client": "13.2.0",
1212
"packages/nock-udp": "3.2.0",
13-
"packages/redirect-parser": "14.4.0",
13+
"packages/redirect-parser": "14.5.0",
1414
"packages/run-utils": "5.2.0",
1515
"packages/opentelemetry-sdk-setup": "1.2.0",
1616
"packages/opentelemetry-utils": "1.3.0",
17-
"packages/zip-it-and-ship-it": "9.42.0"
17+
"packages/zip-it-and-ship-it": "9.42.1"
1818
}

0 commit comments

Comments
 (0)