Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 75543d9

Browse files
authoredOct 16, 2024··
Merge branch 'main' into renovate/netlify-blobs-8.x
2 parents 31c34d5 + fb4ae6d commit 75543d9

24 files changed

+56470
-12667
lines changed
 

‎.github/workflows/e2e-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
- name: Deploy e2e page
5757
if: success()
5858
run: |
59-
ntl deploy --build --cwd e2e-report
59+
npx netlify deploy --build --cwd e2e-report

‎.github/workflows/run-tests.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
else
4141
echo "matrix=[\"latest\"]" >> $GITHUB_OUTPUT
4242
fi
43+
4344
e2e:
4445
needs: setup
4546
runs-on: ubuntu-latest
@@ -68,14 +69,13 @@ jobs:
6869
deno-version: v1.37.0
6970
- name: 'Install dependencies'
7071
run: npm ci
71-
- name: 'Netlify Login'
72+
- name: 'Prepare Netlify CLI'
7273
env:
7374
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
7475
run: |
75-
# TODO(serhalp) Unpin version once
76-
# https://netlify.slack.com/archives/C07686YAY13/p1718139257978049 is resolved.
77-
npm i -g netlify-cli@17.26.0
78-
netlify login
76+
# Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
77+
npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
78+
npx netlify login
7979
- name: Get installed Playwright version
8080
id: playwright-version
8181
run: echo "version=$(npm view @playwright/test version)" >> $GITHUB_OUTPUT
@@ -204,14 +204,13 @@ jobs:
204204
run: npm ci
205205
- name: 'Build'
206206
run: npm run build
207-
- name: 'Netlify Login'
207+
- name: 'Prepare Netlify CLI'
208208
env:
209209
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
210210
run: |
211-
# TODO(serhalp) Unpin version once
212-
# https://netlify.slack.com/archives/C07686YAY13/p1718139257978049 is resolved.
213-
npm i -g netlify-cli@17.26.0
214-
netlify login
211+
# Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
212+
npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
213+
npx netlify login
215214
- name: Resolve Next.js version
216215
id: resolve-next-version
217216
shell: bash

‎.github/workflows/test-e2e.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ jobs:
9393
9494
e2e:
9595
needs: setup
96-
runs-on: ubuntu-latest
96+
# `playwright install` fails on Ubuntu 24.04+ with older versions of playwright (which 13.5.1 has)
97+
runs-on: "${{ matrix.version_spec.selector == '13.5.1' && 'ubuntu-22.04' || 'ubuntu-latest' }}"
9798
name: Test next@${{ matrix.version_spec.selector }} group ${{ matrix.group }}/${{ needs.setup.outputs.total }}
9899
timeout-minutes: 120
99100
strategy:
@@ -179,8 +180,9 @@ jobs:
179180
run: npm run build
180181
working-directory: ${{ env.runtime-path }}
181182

182-
- name: add netlify cli
183-
run: npm install -g netlify-cli
183+
- name: Prepare Netlify CLI
184+
# Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
185+
run: npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
184186

185187
- name: Install Playwright Browsers
186188
run: npx playwright install --with-deps

‎.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "5.7.4"
2+
".": "5.8.0"
33
}

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [5.8.0](https://github.com/netlify/next-runtime/compare/v5.7.4...v5.8.0) (2024-10-16)
4+
5+
6+
### Features
7+
8+
* cache 404s indefinitely for bot probes ([#2668](https://github.com/netlify/next-runtime/issues/2668)) ([60885d2](https://github.com/netlify/next-runtime/commit/60885d2725de5d1c465a4405fdf86f1808c8434c))
9+
10+
11+
### Bug Fixes
12+
13+
* adjust cache-control handling for next@15.0.0-canary.187 ([#2666](https://github.com/netlify/next-runtime/issues/2666)) ([7e5253d](https://github.com/netlify/next-runtime/commit/7e5253dfa63f46b96abe8bf17df1602319445602))
14+
* use alternative way of gathering api functions to anaylze ([#2654](https://github.com/netlify/next-runtime/issues/2654)) ([e4916da](https://github.com/netlify/next-runtime/commit/e4916da94ec12ad47792f16e5f3098337fa33f36))
15+
316
## [5.7.4](https://github.com/netlify/next-runtime/compare/v5.7.3...v5.7.4) (2024-10-09)
417

518

0 commit comments

Comments
 (0)
Please sign in to comment.