Merge branch 'main' into fix-cypress-fork

Author: martinjagodic

.github/workflows/nodejs.yml

@@ -60,7 +60,7 @@ jobs:
     if: ${{ needs.changes.outputs.cms == 'true' }}
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false # Let Cypress Cloud auto-cancellation handle failures
       matrix:
         machine: [1, 2, 3, 4]
     steps:
@@ -99,6 +99,8 @@ jobs:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           NODE_OPTIONS: --max-old-space-size=4096
           TZ: Europe/Amsterdam
+          GITHUB_EVENT_NAME: ${{ github.event_name }}
+          GITHUB_BASE_REF: ${{ github.base_ref }}
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

cypress.config.ts

@@ -3,7 +3,7 @@ import { defineConfig } from 'cypress';
 export default defineConfig({
   projectId: '1c35bs',
   retries: {
-    runMode: 4,
+    runMode: 2, // Reduced from 4 - Cypress Cloud helps identify flaky tests
     openMode: 0,
   },
   e2e: {

cypress/run.mjs

@@ -29,17 +29,32 @@ async function runCypress() {
   } else {
     const ciBuildId =
       process.env.CI_BUILD_ID || process.env.GITHUB_RUN_ID || process.env.GITHUB_SHA;
-
+    
+    // Determine group name based on context
+    const isPR = process.env.GITHUB_EVENT_NAME === 'pull_request';
+    const groupName = isPR ? 'PR Checks' : 'GitHub CI';
+    
+    // Add tags for better organization in Cypress Cloud
+    const tags = [];
+    if (isPR) tags.push('pr');
+    if (process.env.GITHUB_BASE_REF) tags.push(`base:${process.env.GITHUB_BASE_REF}`);
+    
     args.push(
       '--record',
       '--parallel',
       '--ci-build-id',
       ciBuildId,
       '--group',
-      'GitHub CI',
-      '--spec',
-      specs.join(','),
+      groupName,
     );
+    
+    // Add tags if present
+    if (tags.length > 0) {
+      args.push('--tag', tags.join(','));
+    }
+    
+    // Enable auto-cancellation to save CI time on failures
+    args.push('--auto-cancel-after-failures', '3');
   }
 
   console.log('Running Cypress with args:', args.join(' '));