tmp: just testing use-cache integration test

pieh · pieh · commit 8529612fac37 · 2025-04-30T11:36:51.000+02:00
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -36,89 +36,18 @@ jobs:
           if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
             echo "matrix=${{ github.event.inputs.versions }}" >> $GITHUB_OUTPUT
           elif [ "${{ github.event_name }}" = "schedule" ] || [ "${{ steps.check-labels.outputs.result }}" = "true" ]; then
-            echo "matrix=[\"latest\", \"canary\", \"14.2.15\", \"13.5.1\"]" >> $GITHUB_OUTPUT
+            echo "matrix=[\"latest\", \"canary\"]" >> $GITHUB_OUTPUT
           else
             echo "matrix=[\"latest\"]" >> $GITHUB_OUTPUT
           fi
 
-  e2e:
-    needs: setup
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ${{ fromJson(needs.setup.outputs.matrix) }}
-        shard: [1, 2, 3, 4, 5]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: 'Install Node'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18.x'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
-      - uses: oven-sh/setup-bun@v1
-      - name: setup pnpm/yarn
-        run: |
-          npm install -g corepack
-          corepack enable
-        shell: bash
-      - name: Install Deno
-        uses: denoland/setup-deno@v1
-        with:
-          # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
-          deno-version: v1.44.4
-      - name: 'Install dependencies'
-        run: npm ci
-      - name: 'Prepare Netlify CLI'
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-        run: |
-          # 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
-      - uses: actions/cache@v4
-        id: playwright-cache
-        with:
-          path: '~/.cache/ms-playwright'
-          key: '${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.version }}'
-          restore-keys: |
-            ${{ runner.os }}-playwright-
-      - name: Install Playwright Browsers
-        if: steps.playwright-cache.outputs.cache-hit != 'true'
-        run: npx playwright install --with-deps
-      - name: Resolve Next.js version
-        id: resolve-next-version
-        shell: bash
-        run: |
-          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: Run Playwright tests
-        run: npm run test:ci:e2e -- --shard=${{ matrix.shard }}/5
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NEXT_VERSION: ${{ matrix.version }}
-          NEXT_RESOLVED_VERSION: ${{ steps.resolve-next-version.outputs.version }}
-      - name: Upload blob report to GitHub Actions Artifacts
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: blob-report-${{matrix.version}}-${{ matrix.shard }}
-          path: blob-report
-          retention-days: 1
-
   test:
     needs: setup
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        shard: [1, 2, 3, 4, 5, 6, 7, 8]
+        shard: [6]
         os: [ubuntu-latest, windows-latest]
         version: ${{ fromJson(needs.setup.outputs.matrix) }}
     steps:
@@ -190,87 +119,3 @@ jobs:
           NEXT_RESOLVED_VERSION: ${{ steps.resolve-next-version.outputs.version }}
           TEMP: ${{ github.workspace }}/..
 
-  smoke:
-    if: always()
-    needs: setup
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ${{ fromJson(needs.setup.outputs.matrix) }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: 'Install Node'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18.x'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
-      - name: setup pnpm/yarn
-        run: corepack enable
-        shell: bash
-      - name: Install Deno
-        uses: denoland/setup-deno@v1
-        with:
-          # Should match the `DENO_VERSION_RANGE` from https://github.com/netlify/build/blob/main/packages/edge-bundler/node/bridge.ts#L20
-          deno-version: v1.44.4
-      - name: 'Install dependencies'
-        run: npm ci
-      - name: 'Build'
-        run: npm run build
-      - name: 'Prepare Netlify CLI'
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-        run: |
-          # 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
-        run: |
-          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'
-        run: npm run test:ci:smoke
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NEXT_VERSION: ${{ matrix.version }}
-          NEXT_RESOLVED_VERSION: ${{ steps.resolve-next-version.outputs.version }}
-
-  merge-reports:
-    if: always()
-    needs: [setup,e2e]
-    strategy:
-      fail-fast: false
-      matrix:
-        version: ${{ fromJson(needs.setup.outputs.matrix) }}
-
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 18
-    - name: Install dependencies
-      run: npm ci
-
-    - name: Download blob reports from GitHub Actions Artifacts
-      uses: actions/download-artifact@v4
-      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: 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/tests/integration/use-cache.test.ts b/tests/integration/use-cache.test.ts
@@ -155,22 +155,37 @@ describe.skipIf(!nextVersionSatisfies('>=15.3.0-canary.13'))('use cache', () =>
   // much more performant
   let ctx: FixtureTestContext
   beforeAll(async () => {
-    ctx = {
-      deployID: generateRandomObjectID(),
-      siteID: v4(),
-    } as FixtureTestContext
-
-    vi.stubEnv('SITE_ID', ctx.siteID)
-    vi.stubEnv('DEPLOY_ID', ctx.deployID)
-    vi.stubEnv('NETLIFY_PURGE_API_TOKEN', 'fake-token')
-    await startMockBlobStore(ctx as FixtureTestContext)
-
-    await createFixture('use-cache', ctx)
-    await runPlugin(ctx)
+    console.log(`[${new Date().toISOString()}] Starting use-cache beforeAll`)
+    try {
+      ctx = {
+        deployID: generateRandomObjectID(),
+        siteID: v4(),
+      } as FixtureTestContext
+      ctx.debug = true
+
+      vi.stubEnv('SITE_ID', ctx.siteID)
+      vi.stubEnv('DEPLOY_ID', ctx.deployID)
+      vi.stubEnv('NETLIFY_PURGE_API_TOKEN', 'fake-token')
+      await startMockBlobStore(ctx as FixtureTestContext)
+
+      await createFixture('use-cache', ctx)
+      await runPlugin(ctx)
+      console.log(`[${new Date().toISOString()}] Finished use-cache beforeAll`)
+    } catch (err) {
+      console.log(`[${new Date().toISOString()}] use-cache beforeAll failed`, err)
+      throw err
+    }
   })
 
   afterAll(async () => {
-    await afterTestCleanup(ctx)
+    console.log(`[${new Date().toISOString()}] Finished use-cache afterAll`)
+    try {
+      await afterTestCleanup(ctx)
+      console.log(`[${new Date().toISOString()}] Finished use-cache afterAll`)
+    } catch (err) {
+      console.log(`[${new Date().toISOString()}] use-cache afterAll failed`, err)
+      throw err
+    }
   })
 
   describe('default (in-memory cache entries, shared tag manifests)', () => {
diff --git a/tests/utils/contexts.ts b/tests/utils/contexts.ts
@@ -16,4 +16,5 @@ export interface FixtureTestContext extends TestContext {
   edgeFunctionPort: number
   edgeFunctionOutput: WriteStream
   cleanup?: (() => Promise<void>)[]
+  debug?: boolean
 }
diff --git a/tests/utils/fixture.ts b/tests/utils/fixture.ts
@@ -292,8 +292,25 @@ export async function runPlugin(
       configPath: join(edgeSource, 'manifest.json'),
     })
     const { asset } = result.manifest.bundles[0]
-    const cmd = `deno run --allow-read --allow-write --allow-net --allow-env ${eszipHelper} extract ./${asset} .`
-    await execaCommand(cmd, { cwd: dist })
+
+    if (ctx.debug) {
+      await execaCommand(`deno -v`, { cwd: dist, stdio: 'inherit' })
+      await execaCommand(`deno info`, { cwd: dist, stdio: 'inherit' })
+      await execaCommand(`which deno`, { cwd: dist, stdio: 'inherit' })
+
+      console.log(`[${new Date().toISOString()}] start to extract`, dist)
+    }
+
+    try {
+      const cmd = `deno run --allow-read --allow-write --allow-net --allow-env ${eszipHelper} extract ./${asset} .`
+      await execaCommand(cmd, { cwd: dist })
+      console.log(`[${new Date().toISOString()}] finished extracting`, dist)
+    } catch (err) {
+      if (ctx.debug) {
+        console.log(`[${new Date().toISOString()}] failed extracting`, dist, err)
+      }
+      throw err
+    }
 
     // start the edge functions server:
     const servePath = base.resolveFromPackagePath('.netlify', 'edge-functions-serve')

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,5 @@ export interface FixtureTestContext extends TestContext {`
`16`	`16`	`edgeFunctionPort: number`
`17`	`17`	`edgeFunctionOutput: WriteStream`
`18`	`18`	`cleanup?: (() => Promise<void>)[]`
	`19`	`+ debug?: boolean`
`19`	`20`	`}`