Merge branch 'main' into michalpiechowiak/frb-1360-v15-canary-dynamic…

…-routes-with-fallback-true-are-failing
opennextjs · Oct 16, 2024 · 9169bd5 · 9169bd5
2 parents e8951a8 + c77ece7
commit 9169bd5
Show file tree

Hide file tree

Showing 10 changed files with 55,823 additions and 12,475 deletions.
diff --git a/.github/workflows/e2e-report.yml b/.github/workflows/e2e-report.yml
@@ -56,4 +56,4 @@ jobs:
       - name: Deploy e2e page
         if: success()
         run: |
-          ntl deploy --build --cwd e2e-report
+          npx netlify deploy --build --cwd e2e-report
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -40,6 +40,7 @@ jobs:
           else
             echo "matrix=[\"latest\"]" >> $GITHUB_OUTPUT
           fi
+
   e2e:
     needs: setup
     runs-on: ubuntu-latest
@@ -68,14 +69,13 @@ jobs:
           deno-version: v1.37.0
       - name: 'Install dependencies'
         run: npm ci
-      - name: 'Netlify Login'
+      - name: 'Prepare Netlify CLI'
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
         run: |
-          # TODO(serhalp) Unpin version once
-          # https://netlify.slack.com/archives/C07686YAY13/p1718139257978049 is resolved.
-          npm i -g [email protected]
-          netlify login
+          # Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
+          npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
+          npx netlify login
       - name: Get installed Playwright version
         id: playwright-version
         run: echo "version=$(npm view @playwright/test version)" >> $GITHUB_OUTPUT
@@ -204,14 +204,13 @@ jobs:
         run: npm ci
       - name: 'Build'
         run: npm run build
-      - name: 'Netlify Login'
+      - name: 'Prepare Netlify CLI'
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
         run: |
-          # TODO(serhalp) Unpin version once
-          # https://netlify.slack.com/archives/C07686YAY13/p1718139257978049 is resolved.
-          npm i -g [email protected]
-          netlify login
+          # Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
+          npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
+          npx netlify login
       - name: Resolve Next.js version
         id: resolve-next-version
         shell: bash

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -180,8 +180,9 @@ jobs:
         run: npm run build
         working-directory: ${{ env.runtime-path }}
 
-      - name: add netlify cli
-        run: npm install -g netlify-cli
+      - name: Prepare Netlify CLI
+        # Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
+        run: npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
 
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps