Merge pull request github#16376 from github/repo-sync

repo sync

Author: Octomerger

.github/workflows/browser-test.yml

@@ -59,5 +59,8 @@ jobs:
           path: .next/cache
           key: ${{ runner.os }}-nextjs-${{ hashFiles('package*.json') }}
 
+      - name: Run build script
+        run: npm run build
+
       - name: Run browser-test
         run: npm run browser-test

.github/workflows/test.yml

@@ -140,16 +140,6 @@ jobs:
           NODE_ENV: test
         run: ./script/warm-before-tests.mjs
 
-      - name: Start production-like server in the background
-        if: ${{ matrix.test-group == 'rendering' || matrix.test-group == 'routing' || matrix.test-group == 'content' }}
-        env:
-          NODE_ENV: test
-          PORT: 4000
-        run: |
-          node server.mjs &
-          sleep 3
-          curl --retry-connrefused --retry 5 -I --fail http://localhost:4000/healthz
-
       - name: Run tests
         env:
           DIFF_FILE: get_diff_files.txt

Dockerfile

@@ -89,6 +89,7 @@ COPY --chown=node:node feature-flags.json ./
 COPY --chown=node:node data ./data
 COPY --chown=node:node next.config.js ./
 COPY --chown=node:node server.mjs ./server.mjs
+COPY --chown=node:node start-server.mjs ./start-server.mjs
 
 EXPOSE $PORT
 

jest.config.js

@@ -41,4 +41,6 @@ module.exports = {
   ],
   testMatch: ['**/tests/**/*.js'],
   testLocationInResults: isActions,
+  globalSetup: './script/start-server-for-jest.mjs',
+  globalTeardown: './script/kill-server-for-jest.mjs',
 }