upload artifcats aa

pieh · pieh · commit 44c9e7b26328 · 2025-10-06T12:52:54.000+02:00
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,15 +1,15 @@
-name: 'Run tests'
+name: "Run tests"
 on:
   pull_request:
     branches: [main]
   schedule:
-    - cron: '0 6 * * *' # Run every day at 6am UTC
+    - cron: "0 6 * * *" # Run every day at 6am UTC
   workflow_dispatch:
     inputs:
       versions:
-        description: 'The versions of Next.js to test against (quoted and comma separated)'
+        description: "The versions of Next.js to test against (quoted and comma separated)"
         required: false
-        default: 'latest'
+        default: "latest"
 
 jobs:
   setup:
@@ -65,12 +65,12 @@ jobs:
           fi
           echo "version=$NODE_VERSION" >> $GITHUB_OUTPUT
           echo "Node version for 'next@${{ matrix.version }}' is '$NODE_VERSION'"
-      - name: 'Install Node'
+      - name: "Install Node"
         uses: actions/setup-node@v5
         with:
           node-version: ${{ steps.decide-node-version.outputs.version }}
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: "npm"
+          cache-dependency-path: "**/package-lock.json"
       - uses: oven-sh/setup-bun@v2
       - name: setup pnpm/yarn
         run: |
@@ -82,9 +82,9 @@ jobs:
         with:
           # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
           deno-version: v2.2.4
-      - name: 'Install dependencies'
+      - name: "Install dependencies"
         run: npm ci
-      - name: 'Prepare Netlify CLI'
+      - name: "Prepare Netlify CLI"
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
         run: |
@@ -97,8 +97,8 @@ jobs:
       - uses: actions/cache@v4
         id: playwright-cache
         with:
-          path: '~/.cache/ms-playwright'
-          key: '${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}'
+          path: "~/.cache/ms-playwright"
+          key: "${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}"
           restore-keys: |
             ${{ runner.os }}-playwright-
       - name: Install Playwright Browsers
@@ -124,6 +124,13 @@ jobs:
           name: blob-report-${{matrix.version}}-${{ matrix.shard }}
           path: blob-report
           retention-days: 1
+      - name: Upload debug artifacts
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: debug-artifacts-${{matrix.version}}-${{ matrix.shard }}
+          path: debug-artifacts
+          retention-days: 1
 
   test:
     needs: setup
@@ -135,9 +142,9 @@ jobs:
         version: ${{ fromJson(needs.setup.outputs.matrix) }}
         exclude:
           - os: windows-2025
-            version: '13.5.1'
+            version: "13.5.1"
           - os: windows-2025
-            version: '14.2.15'
+            version: "14.2.15"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v5
@@ -154,12 +161,12 @@ jobs:
           fi
           echo "version=$NODE_VERSION" >> $GITHUB_OUTPUT
           echo "Node version for 'next@${{ matrix.version }}' is '$NODE_VERSION'"
-      - name: 'Install Node'
+      - name: "Install Node"
         uses: actions/setup-node@v5
         with:
           node-version: ${{ steps.decide-node-version.outputs.version }}
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: "npm"
+          cache-dependency-path: "**/package-lock.json"
       - name: Prefer npm global on windows
         if: runner.os == 'Windows'
         # On Windows by default PATH prefers corepack bundled with Node.js
@@ -178,11 +185,11 @@ jobs:
         with:
           # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/edge-bundler/blob/e55f825bd985d3c92e21d1b765d71e70d5628fba/node/bridge.ts#L17
           deno-version: v2.2.4
-      - name: 'Install dependencies'
+      - name: "Install dependencies"
         run: npm ci
-      - name: 'Build'
+      - name: "Build"
         run: npm run build
-      - name: 'Vendor deno helpers for integration tests'
+      - name: "Vendor deno helpers for integration tests"
         run: node tools/vendor-deno-tools.js
       - name: Resolve Next.js version
         id: resolve-next-version
@@ -207,13 +214,13 @@ jobs:
           key:
             integration-fixtures-${{ runner.os }}-${{steps.resolve-next-version.outputs.version}}-${{
             steps.fixture-cache-key.outputs.key }}
-      - name: 'Prepare Fixtures'
+      - name: "Prepare Fixtures"
         if: steps.cache-fixtures.outputs.cache-hit != 'true'
         run: npm run pretest
         env:
           NEXT_VERSION: ${{ matrix.version }}
           NEXT_RESOLVED_VERSION: ${{ steps.resolve-next-version.outputs.version }}
-      - name: 'Unit and integration tests'
+      - name: "Unit and integration tests"
         run: npm run test:ci:unit-and-integration -- --shard=${{ matrix.shard }}/8
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
@@ -244,12 +251,12 @@ jobs:
           fi
           echo "version=$NODE_VERSION" >> $GITHUB_OUTPUT
           echo "Node version for 'next@${{ matrix.version }}' is '$NODE_VERSION'"
-      - name: 'Install Node'
+      - name: "Install Node"
         uses: actions/setup-node@v5
         with:
           node-version: ${{ steps.decide-node-version.outputs.version }}
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
+          cache: "npm"
+          cache-dependency-path: "**/package-lock.json"
       - name: setup pnpm/yarn
         run: corepack enable
         shell: bash
@@ -258,11 +265,11 @@ jobs:
         with:
           # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
           deno-version: v2.2.4
-      - name: 'Install dependencies'
+      - name: "Install dependencies"
         run: npm ci
-      - name: 'Build'
+      - name: "Build"
         run: npm run build
-      - name: 'Prepare Netlify CLI'
+      - name: "Prepare Netlify CLI"
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
         run: |
@@ -276,7 +283,7 @@ jobs:
           RESOLVED_VERSION=$(npm view next@${{ matrix.version }} version)
           echo "version=$RESOLVED_VERSION" >> $GITHUB_OUTPUT
           echo "Resolved Next.js version for 'next@${{ matrix.version }}' is '$RESOLVED_VERSION'"
-      - name: 'Smoke tests'
+      - name: "Smoke tests"
         run: npm run test:ci:smoke
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
@@ -285,36 +292,36 @@ jobs:
 
   merge-reports:
     if: always()
-    needs: [setup,e2e]
+    needs: [setup, e2e]
     strategy:
       fail-fast: false
       matrix:
         version: ${{ fromJson(needs.setup.outputs.matrix) }}
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
-    - uses: actions/setup-node@v5
-      with:
-        node-version: 18
-    - name: Install dependencies
-      run: npm ci
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v5
+        with:
+          node-version: 18
+      - name: Install dependencies
+        run: npm ci
 
-    - name: Download blob reports from GitHub Actions Artifacts
-      uses: actions/download-artifact@v5
-      with:
-        path: all-blob-reports
-        pattern: blob-report-${{ matrix.version }}-*
-        merge-multiple: true
+      - name: Download blob reports from GitHub Actions Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          path: all-blob-reports
+          pattern: blob-report-${{ matrix.version }}-*
+          merge-multiple: true
 
-    - name: Merge reports
-      run: |
-        npx playwright merge-reports --reporter html ./all-blob-reports
-        npx playwright merge-reports --reporter json ./all-blob-reports > merged_reports.json
+      - name: Merge reports
+        run: |
+          npx playwright merge-reports --reporter html ./all-blob-reports
+          npx playwright merge-reports --reporter json ./all-blob-reports > merged_reports.json
 
-    - name: Upload HTML report
-      uses: actions/upload-artifact@v4
-      with:
-        name: html-report-${{ matrix.version }}-attempt-${{ github.run_attempt }}
-        path: playwright-report
-        retention-days: 14
+      - name: Upload HTML report
+        uses: actions/upload-artifact@v4
+        with:
+          name: html-report-${{ matrix.version }}-attempt-${{ github.run_attempt }}
+          path: playwright-report
+          retention-days: 14
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -10,7 +10,7 @@ export default defineConfig({
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: Boolean(process.env.CI),
   /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
+  retries: process.env.CI ? 0 : 0,
   /* Limit the number of workers on CI, use default locally */
   workers: process.env.CI ? 3 : undefined,
   globalSetup: './tests/test-setup-e2e.ts',
diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts
@@ -2,9 +2,9 @@ import { execaCommand } from 'execa'
 import fg from 'fast-glob'
 import { exec } from 'node:child_process'
 import { existsSync } from 'node:fs'
-import { appendFile, copyFile, mkdir, mkdtemp, readFile, rm } from 'node:fs/promises'
+import { appendFile, copyFile, cp, mkdir, mkdtemp, readFile, rm } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
-import { dirname, join } from 'node:path'
+import { basename, dirname, join } from 'node:path'
 import process from 'node:process'
 import { fileURLToPath } from 'node:url'
 import { cpus } from 'os'
@@ -69,7 +69,10 @@ export const createE2EFixture = async (fixture: string, config: E2EConfig = {})
     }
     console.log('\n\n\n🪵  Deploy logs:')
     console.log(logs)
-    // on failures we don't delete the deploy
+    // on failures locally we don't delete the deploy
+    if (process.env.CI) {
+      return cleanup(isolatedFixtureRoot, deployID)
+    }
   }
   try {
     const [packageName] = await Promise.all([
@@ -274,7 +277,23 @@ async function deploySite(
   }
 
   const siteDir = join(isolatedFixtureRoot, cwd)
-  await execaCommand(cmd, { cwd: siteDir, all: true }).pipeAll?.(join(siteDir, outputFile))
+  try {
+    await execaCommand(cmd, { cwd: siteDir, all: true }).pipeAll?.(join(siteDir, outputFile))
+  } catch (error: unknown) {
+    // try to collect zips if they exist
+    const functionsPath = join(isolatedFixtureRoot, packagePath ?? '', '.netlify/functions')
+    const zipPaths = await fg.glob('**/*.zip', {
+      cwd: functionsPath,
+      dot: true,
+    })
+    if (zipPaths.length) {
+      const debugDir = join('debug-artifacts', isolatedFixtureRoot)
+      await mkdir(debugDir, { recursive: true })
+      for (const path of zipPaths) {
+        await cp(join(functionsPath, path), join(debugDir, basename(path)))
+      }
+    }
+  }
   const output = await readFile(join(siteDir, outputFile), 'utf-8')
 
   const { siteName, deployID } =
