Merge branch 'rs/riot-middleware' of github.com:netlify/netlify-plugin-nextjs into rs/riot-middleware

Author: orinokai

.github/workflows/e2e-report.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Download latest e2e results
         if: ${{ steps.get-run-id.outputs.runId }}
         run: |
-          echo "Downloading latest test results from run https://github.com/netlify/next-runtime-minimal/actions/runs/${{ steps.get-run-id.outputs.runId }}"
+          echo "Downloading latest test results from run https://github.com/netlify/next-runtime/actions/runs/${{ steps.get-run-id.outputs.runId }}"
           rm e2e-report/data/test-results.json
           gh run download ${{ steps.get-run-id.outputs.runId }} -n "latest-test-results.json" -D e2e-report/data/ --repo $GITHUB_REPOSITORY
       - name: Install site dependencies

.github/workflows/run-tests.yml

@@ -255,13 +255,14 @@ jobs:
         npx playwright merge-reports --reporter html ./all-blob-reports
         npx playwright merge-reports --reporter json ./all-blob-reports > merged_reports.json
 
-    - name: Notify Slack
-      if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.head_ref == 'main'
-      run: npx playwright-slack-report -j merged_reports.json -c tests/playwright-slack-conf.json
-      env:
-        SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
-        RESULTS_VERSION: ${{ matrix.version }}
-        RESULTS_URL: ${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}
+    # FIXME(serhalp) Once we recover access to the SquidlifyBot Slack App, reenable this.
+    # - name: Notify Slack
+    #   if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || github.head_ref == 'main'
+    #   run: npx playwright-slack-report -j merged_reports.json -c tests/playwright-slack-conf.json
+    #   env:
+    #     SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
+    #     RESULTS_VERSION: ${{ matrix.version }}
+    #     RESULTS_URL: ${{github.server_url}}/${{github.repository}}/actions/runs/${{github.run_id}}
 
     - name: Upload HTML report
       uses: actions/upload-artifact@v4

.github/workflows/test-e2e.yml

@@ -39,7 +39,7 @@ env:
   NETLIFY_SITE_ID: 1d5a5c76-d445-4ae5-b694-b0d3f2e2c395
   NEXT_TEST_CONTINUE_ON_ERROR: 1
   next-path: next.js
-  runtime-path: next-runtime-minimal
+  runtime-path: next-runtime
   GH_TOKEN: ${{ github.token }}
 jobs:
   setup:
@@ -143,7 +143,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.PATH }}
-          key: node-cache-${{ hashFiles('next-runtime-minimal/package-lock.json') }}
+          key: node-cache-${{ hashFiles('next-runtime/package-lock.json') }}
           restore-keys: |
             node-cache-
 
@@ -191,11 +191,11 @@ jobs:
         run: |
           # This is when the manifest version was changed
           if [ `npx semver -p -r ">=14.0.4-canary.26" ${{ matrix.version_spec.version }}` ]; then
-            echo "filters=../next-runtime-minimal/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
-            echo "skip-retry=../next-runtime-minimal/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
+            echo "filters=../next-runtime/tests/netlify-e2e.cjs" >> $GITHUB_OUTPUT
+            echo "skip-retry=../next-runtime/tests/e2e-skip-retry.json" >> $GITHUB_OUTPUT
           else
-            echo "filters=../next-runtime-minimal/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
-            echo "skip-retry=../next-runtime-minimal/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
+            echo "filters=../next-runtime/tests/netlify-e2e-legacy.json" >> $GITHUB_OUTPUT
+            echo "skip-retry=../next-runtime/tests/e2e-skip-retry-legacy.json" >> $GITHUB_OUTPUT
           fi
 
       - name: run tests
@@ -243,7 +243,7 @@ jobs:
       - name: Get and format Github issues
         if: success() || failure()
         run: |
-          gh issue list --label "Next.js e2e test failure" --json number,body > report/issues.json
+          gh issue list --label "Next.js e2e test failure" --json url,body > report/issues.json
           deno run -A tools/deno/ghIssues2json.ts tests/test-config.json report/issues.json
 
       - name: Publish Test Report
@@ -261,11 +261,13 @@ jobs:
         with:
           name: ${{matrix.version_spec.selector}}-test-results.json
           path: report/test-results.json
-      - name: Notify Slack
-        if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
-        uses: slackapi/[email protected]
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-        with:
-          payload: ${{ steps.publish-test-results.outputs.slackEvent }}
+
+      # FIXME(serhalp) Once we recover access to the SquidlifyBot Slack App, reenable this.
+      # - name: Notify Slack
+      #   if: ${{ (success() || failure()) && github.event_name == 'schedule' }}
+      #   uses: slackapi/[email protected]
+      #   env:
+      #     SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+      #     SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+      #   with:
+      #     payload: ${{ steps.publish-test-results.outputs.slackEvent }}