Merge pull request #1208 from sanger/ci-fixes

CI Fixes

Author: yoldas

.github/workflows/build.yml

@@ -14,12 +14,12 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         name: Checkout
       - name: Enable Corepack
         run: corepack enable
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'

.github/workflows/deploy-storybook.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         name: Checkout
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
@@ -28,7 +28,7 @@ jobs:
           yarn build-storybook
 
       - name: Deploy storybook
-        uses: JamesIves/github-pages-deploy-action@4.1.5
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: gh-pages
           folder: storybook-static

.github/workflows/test.yml

@@ -9,50 +9,89 @@ on:
   pull_request:
     branches: [devel]
 
+# Cancel in-progress runs on the same PR when a new push arrives.
+# On pushes to devel, queue runs instead of cancelling so each commit gets a status.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
+  build:
+    if: github.event_name != 'push' || !contains(github.event.head_commit.message, '[skip tests]')
+    name: Build app for cypress
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - name: Setup node
+        uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn --frozen-lockfile --silent
+      - name: Build
+        run: yarn build
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: build
+          path: build
+          retention-days: 1
+
   cypress:
     if: github.event_name != 'push' || !contains(github.event.head_commit.message, '[skip tests]')
-    name: Run cypress tests
+    name: Run cypress tests (${{ matrix.containers }}/4)
+    needs: build
     runs-on: ubuntu-latest
     container:
-      image: cypress/browsers:node18.12.0-chrome106-ff106
-
-      options: --user 1001
+      image: cypress/browsers:22.14.0
+      options: --user 1001 --ipc=host
+    strategy:
+      fail-fast: false
+      matrix:
+        containers: [1, 2, 3, 4]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         name: Checkout
       - name: Setup node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
           cache: 'yarn'
       - name: Install dependencies
         run:  yarn install
+      - name: Download build artifact
+        uses: actions/download-artifact@v8
+        with:
+          name: build
+          path: build
       - name: Cypress run
-        uses: cypress-io/github-action@v6
+        uses: cypress-io/github-action@v7
+        env:
+          SPLIT: ${{ strategy.job-total }}
+          SPLIT_INDEX: ${{ strategy.job-index }}
         with:
-          install-command: yarn --frozen-lockfile --silent
-          build: yarn build
-          start: npx serve -s build -p 3000
+          install: false
+          start: npx serve -s build -p 3000 --no-request-logging
           wait-on: "http://localhost:3000"
           config: baseUrl=http://localhost:3000
           browser: chrome
       # store any screenshots of the failing tests as artifacts
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: failure()
         with:
           overwrite: true
-          name: cypress-screenshots
+          name: cypress-screenshots-${{ matrix.containers }}
           path: cypress/screenshots
 
   jest:
     if: github.event_name != 'push' || !contains(github.event.head_commit.message, '[skip tests]')
     name: Run unit tests
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - name: Setup node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
@@ -66,9 +105,9 @@ jobs:
     name: Check format with prettier
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - name: Setup node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'
@@ -82,9 +121,9 @@ jobs:
     name: Lint with ESLint
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - name: Setup node
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
         node-version-file: '.nvmrc'
         cache: 'yarn'

cypress.config.ts

@@ -1,16 +1,17 @@
 import { defineConfig } from 'cypress';
+import cypressSplit from 'cypress-split';
 
 export default defineConfig({
   video: false,
   defaultCommandTimeout: 15000,
-  retries: 2,
+  retries: { runMode: 1, openMode: 0 },
   numTestsKeptInMemory: 0,
   experimentalMemoryManagement: true,
   e2e: {
-    // We've imported your old cypress plugins here.
-    // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
-      return require("./cypress/plugins/index.js")(on, config);
+      cypressSplit(on, config);
+      require('./cypress/plugins/index.js')(on, config);
+      return config;
     },
     baseUrl: "http://localhost:3000",
     testIsolation: false,

package.json

@@ -118,6 +118,7 @@
     "babel-plugin-polyfill-corejs2": "^0.4.6",
     "cypress": "^14.1.0",
     "cypress-intellij-reporter": "^0.0.7",
+    "cypress-split": "^1.24.0",
     "eslint-config-prettier": "10.0.1",
     "fishery": "^2.2.2",
     "identity-obj-proxy": "^3.0.0",