Merge pull request #3 from useblacksmith/syncForkAgain

Sync fork
useblacksmith · Dec 3, 2024 · b9936aa · b9936aa
2 parents 6b65ac4 + 40714f2
commit b9936aa
Show file tree

Hide file tree

Showing 89 changed files with 49,165 additions and 51,552 deletions.
diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
@@ -14,15 +14,19 @@ on:
 
 jobs:
   check-dist:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20.8.1
+          # Action runs: using: node20 as defined in
+          # https://github.com/cypress-io/github-action/blob/master/action.yml
+          # Node.js minor version is aligned to
+          # https://github.com/actions/runner/blob/main/src/Misc/externals.sh
+          node-version: 20.18.0
       - run: npm ci
       - run: npm run format
       - run: npm run build

diff --git a/.github/workflows/check-markdown.yml b/.github/workflows/check-markdown.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   check-markdown-links:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     name: Check links in Markdown files
     steps:
       - name: Checkout

diff --git a/.github/workflows/example-basic-pnpm.yml b/.github/workflows/example-basic-pnpm.yml
@@ -8,92 +8,37 @@ on:
 
 jobs:
 
-  basic-pnpm-ubuntu-20:
-    runs-on: ubuntu-20.04
+  basic-pnpm:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04, windows-2022, macos-14]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+        # See https://github.com/pnpm/action-setup
       - name: Install pnpm
-        run: npm install -g pnpm@9
-
-      - name: Cypress tests
-        # normally you would write
-        # uses: cypress-io/github-action@v6
-        uses: ./
-        # the parameters below are only necessary
-        # because we are running these examples in a monorepo
+        uses: pnpm/action-setup@v4
         with:
-          working-directory: examples/basic-pnpm
-          # just for full picture after installing Cypress
-          # print information about detected browsers, etc
-          # see https://on.cypress.io/command-line#cypress-info
-          build: npx cypress info
-
-  basic-pnpm-ubuntu-22:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install pnpm
-        run: npm install -g pnpm@9
+          version: 9
 
-      - name: Cypress tests
-        uses: ./
+        # See https://github.com/actions/setup-node
+      - name: Install Node.js
+        uses: actions/setup-node@v4
         with:
-          working-directory: examples/basic-pnpm
-          build: npx cypress info
-
-  basic-pnpm-on-windows:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install pnpm
-        run: npm install -g pnpm@9
-
-      - name: Cypress tests
-        uses: ./
-        with:
-          working-directory: examples/basic-pnpm
-          build: npx cypress info
-
-  basic-pnpm-on-mac:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install pnpm
-        run: npm install -g pnpm@9
-
-      - name: Cypress tests
-        uses: ./
-        with:
-          working-directory: examples/basic-pnpm
-          build: npx cypress info
-
-  # skips the binary installation
-  # shows that the job should not fail
-  # https://github.com/cypress-io/github-action/issues/327
-  basic-pnpm-without-binary-install:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install pnpm
-        run: npm install -g pnpm@9
+          node-version: 22
+          cache: 'pnpm'
+          cache-dependency-path: examples/basic-pnpm/pnpm-lock.yaml
 
       - name: Cypress tests
+        # if you copy this workflow to another repository
+        # take the next line as replacement for ./
+        # uses: cypress-io/github-action@v6
         uses: ./
         with:
           working-directory: examples/basic-pnpm
-          # since we do not install Cypress
-          # we should not attempt to run tests
-          runTests: false
-        env:
-          # skip the binary install
-          CYPRESS_INSTALL_BINARY: 0
+          # print information about detected browsers, etc
+          # see https://on.cypress.io/command-line#cypress-info
+          build: pnpm exec cypress info
diff --git a/.github/workflows/example-basic.yml b/.github/workflows/example-basic.yml
@@ -9,8 +9,12 @@ on:
 
 jobs:
 
-  basic-ubuntu-20:
-    runs-on: ubuntu-20.04
+  basic:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2022, macos-14]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -27,59 +31,3 @@ jobs:
           # print information about detected browsers, etc
           # see https://on.cypress.io/command-line#cypress-info
           build: npx cypress info
-
-  basic-ubuntu-22:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Cypress tests
-        uses: ./
-        with:
-          working-directory: examples/basic
-          build: npx cypress info
-
-  basic-on-windows:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Cypress tests
-        uses: ./
-        with:
-          working-directory: examples/basic
-          build: npx cypress info
-
-  basic-on-mac:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Cypress tests
-        uses: ./
-        with:
-          working-directory: examples/basic
-          build: npx cypress info
-
-  # skips the binary installation
-  # shows that the job should not fail
-  # https://github.com/cypress-io/github-action/issues/327
-  basic-without-binary-install:
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Cypress tests
-        uses: ./
-        with:
-          working-directory: examples/basic
-          # since we do not install Cypress
-          # we should not attempt to run tests
-          runTests: false
-        env:
-          # skip the binary install
-          CYPRESS_INSTALL_BINARY: 0
diff --git a/.github/workflows/example-chrome.yml b/.github/workflows/example-chrome.yml
@@ -9,7 +9,7 @@ on:
 jobs:
 
   tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/example-component-test.yml b/.github/workflows/example-component-test.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   cypress-run:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/example-config.yml b/.github/workflows/example-config.yml
@@ -10,7 +10,7 @@ jobs:
 
   start:
     # example where we pass custom base URL
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -26,7 +26,7 @@ jobs:
 
   config-file:
     # example where we use a custom config-file
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -42,7 +42,7 @@ jobs:
 
   separate-specs:
     # example where we pass specs to run via multiple lines
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -61,7 +61,7 @@ jobs:
 
   separate-specs-with-wildcard:
     # example where we pass specs to run via multiple lines and wildcards
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/example-cron.yml b/.github/workflows/example-cron.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   nightly:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/example-custom-ci-build-id.yml b/.github/workflows/example-custom-ci-build-id.yml
@@ -40,7 +40,7 @@ env:
 jobs:
 
   check-record-key:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       record-key-exists: ${{ steps.record-key-check.outputs.defined }}
     steps:
@@ -56,7 +56,7 @@ jobs:
   # single job that generates and outputs a common id
   prepare:
     needs: [check-record-key]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: needs.check-record-key.outputs.record-key-exists == 'true'
     outputs:
       uuid: ${{ steps.uuid.outputs.value }}
@@ -75,7 +75,7 @@ jobs:
   # and record it to the Cypress Cloud
   smoke-tests:
     needs: [prepare]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout 🛎
         uses: actions/checkout@v4
@@ -101,7 +101,7 @@ jobs:
   # under different groups
   all-tests:
     needs: [prepare, smoke-tests]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/example-custom-command.yml b/.github/workflows/example-custom-command.yml
@@ -11,7 +11,7 @@ jobs:
   start:
     # example where instead of forming the default "cypress run ..."
     # the user can specify their own command
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout 🛎
         uses: actions/checkout@v4