ci: use CYPRESS_BAIL

fgnass · Dec 24, 2024 · 03e68e6 · 03e68e6
1 parent ec664c5
commit 03e68e6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -24,8 +24,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        node-version: [18.x, 20.x]
+        os: [ubuntu-latest] # [macos-latest, windows-latest, ubuntu-latest]
+        node-version: [20.x] # [18.x, 20.x]
       fail-fast: true
     if: ${{ needs.changes.outputs.cms == 'true' }}
     steps:
@@ -46,12 +46,13 @@ jobs:
         run: npm run build:demo
       - name: run e2e tests
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
-        run: npm run test:e2e:run-ci -- --bail
+        run: npm run test:e2e:run-ci
         env:
           IS_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true || github.repository_owner != 'decaporg' }}
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           NODE_OPTIONS: --max-old-space-size=4096
           TZ: Europe/Amsterdam
+          CYPRESS_BAIL: true
       - uses: actions/upload-artifact@v3
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x' && failure()
         with:

diff --git a/cypress/run.mjs b/cypress/run.mjs
@@ -2,6 +2,12 @@ import execa from 'execa';
 import { globby } from 'globby';
 
 async function runCypress() {
+  const args = ['run', '--browser', 'chrome', '--headless'];
+
+  if (process.env.CYPRESS_BAIL === 'true') {
+    args.push('--bail');
+  }
+
   if (process.env.IS_FORK === 'true') {
     const machineIndex = parseInt(process.env.MACHINE_INDEX);
     const machineCount = parseInt(process.env.MACHINE_COUNT);
@@ -13,29 +19,18 @@ async function runCypress() {
         ? specs.slice(start)
         : specs.slice(start, start + specsPerMachine);
 
-    await execa(
-      'cypress',
-      ['run', '--browser', 'chrome', '--headless', '--bail', '--spec', machineSpecs.join(',')],
-      { stdio: 'inherit', preferLocal: true },
-    );
+    args.push('--spec', machineSpecs.join(','));
+    await execa('cypress', args, { stdio: 'inherit', preferLocal: true });
   } else {
-    await execa(
-      'cypress',
-      [
-        'run',
-        '--browser',
-        'chrome',
-        '--headless',
-        '--bail',
-        '--record',
-        '--parallel',
-        '--ci-build-id',
-        process.env.GITHUB_SHA,
-        '--group',
-        'GitHub CI',
-      ],
-      { stdio: 'inherit', preferLocal: true },
+    args.push(
+      '--record',
+      '--parallel',
+      '--ci-build-id',
+      process.env.GITHUB_SHA,
+      '--group',
+      'GitHub CI',
     );
+    await execa('cypress', args, { stdio: 'inherit', preferLocal: true });
   }
 }