Skip to content

Commit

Permalink
Merge branch 'main' into renovate/esbuild-0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Dec 16, 2024
2 parents e0a88de + 959e015 commit 1136e0e
Show file tree
Hide file tree
Showing 33 changed files with 427 additions and 164 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ on:

jobs:
benchmark:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: '*'
node-version: '22'
cache: 'npm'
check-latest: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ defaults:

jobs:
fossa:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ on:
- releases/*/*/*
jobs:
prerelease:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: '*'
node-version: '22'
check-latest: true
registry-url: 'https://registry.npmjs.org'
- name: Extract tag, version and package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stalebot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typescript-nudge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
name: TypeScript conversion nudge
jobs:
Nudge-to-convert-to-TypeScript-if-JavaScript-found:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
50 changes: 14 additions & 36 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
merge_group:
jobs:
e2e:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 60
steps:
# Sets an output parameter if this is a release PR
Expand All @@ -27,7 +27,7 @@ jobs:
if: ${{ !steps.release-check.outputs.IS_RELEASE }}
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
if: ${{ !steps.release-check.outputs.IS_RELEASE }}
- name: Install dependencies
run: npm ci
Expand All @@ -49,12 +49,13 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
node-version: ['*']
os: [ubuntu-24.04, macos-14, windows-2022]
node-version: ['22']
# Must include the minimum deno version from the `DENO_VERSION_RANGE` constant in `node/bridge.ts`.
deno-version: ['v1.39.0', 'v1.46.3']
include:
- os: ubuntu-latest
- os: ubuntu-24.04
# Earliest supported version
node-version: '14.16.0'
deno-version: 'v1.46.3'
fail-fast: false
Expand All @@ -63,7 +64,7 @@ jobs:
# https://github.com/actions/virtual-environments/issues/268
- name: Increase open file limit
run: sudo ulimit -Sn 65536
if: "${{ matrix.os == 'macOS-latest' }}"
if: "${{ matrix.os == 'macos-14' }}"
- run: git config --global core.symlinks true
# Sets an output parameter if this is a release PR
- name: Check for release
Expand Down Expand Up @@ -121,56 +122,33 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
node-version: ['*']
os: [ubuntu-24.04, macos-14, windows-2022]
node-version: ['22']
install-command: ['npm ci']
machine: ['0', '1', '2', '3', '4']
include:
# We test on the oldest supported Node.js version, but only with a
# single combination (Ubuntu)
- os: ubuntu-latest
- os: ubuntu-24.04
node-version: '14.16.0'
install-command: npm ci
machine: '0'
- os: ubuntu-latest
- os: ubuntu-24.04
node-version: '14.16.0'
install-command: npm ci
machine: '1'
- os: ubuntu-latest
- os: ubuntu-24.04
node-version: '14.16.0'
install-command: npm ci
machine: '2'
- os: ubuntu-latest
- os: ubuntu-24.04
node-version: '14.16.0'
install-command: npm ci
machine: '3'
- os: ubuntu-latest
- os: ubuntu-24.04
node-version: '14.16.0'
install-command: npm ci
machine: '4'
# The buildbot pins Netlify Build's dependencies, like `npm ci`.
# But other consumers do not, like `npm install`.
# So we test both.
- os: ubuntu-latest
node-version: '*'
install-command: npm install --no-package-lock
machine: '0'
- os: ubuntu-latest
node-version: '*'
install-command: npm install --no-package-lock
machine: '1'
- os: ubuntu-latest
node-version: '*'
install-command: npm install --no-package-lock
machine: '2'
- os: ubuntu-latest
node-version: '*'
install-command: npm install --no-package-lock
machine: '3'
- os: ubuntu-latest
node-version: '*'
install-command: npm install --no-package-lock
machine: '4'
fail-fast: false
steps:
# Sets an output parameter if this is a release PR
Expand Down
16 changes: 8 additions & 8 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"packages/build-info": "7.16.0",
"packages/build": "29.57.0",
"packages/edge-bundler": "12.3.0",
"packages/build-info": "7.17.0",
"packages/build": "29.58.0",
"packages/edge-bundler": "12.3.1",
"packages/cache-utils": "5.2.0",
"packages/config": "20.20.0",
"packages/config": "20.21.0",
"packages/framework-info": "9.9.0",
"packages/functions-utils": "5.3.0",
"packages/functions-utils": "5.3.1",
"packages/git-utils": "5.2.0",
"packages/headers-parser": "7.2.0",
"packages/headers-parser": "7.3.0",
"packages/js-client": "13.2.0",
"packages/nock-udp": "3.2.0",
"packages/redirect-parser": "14.4.0",
"packages/redirect-parser": "14.5.0",
"packages/run-utils": "5.2.0",
"packages/opentelemetry-sdk-setup": "1.2.0",
"packages/opentelemetry-utils": "1.3.0",
"packages/zip-it-and-ship-it": "9.42.0"
"packages/zip-it-and-ship-it": "9.42.1"
}
Loading

0 comments on commit 1136e0e

Please sign in to comment.