Merge pull request #727 from MikeMcC399/remove-v10-label

Restructure v9 and v10 examples
cypress-io · Jan 19, 2023 · d1d2ac8 · d1d2ac8
2 parents 5b25ab3 + 1b1c17d
commit d1d2ac8
Show file tree

Hide file tree

Showing 162 changed files with 185 additions and 185 deletions.
diff --git a/.github/workflows/example-basic-pnpm.yml b/.github/workflows/example-basic-pnpm.yml
@@ -5,9 +5,9 @@ on:
       - 'master'
   pull_request:
 jobs:
-  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cypress v9 and lower ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
+  # ~~~~~~~~~~~~~~~~~~ Cypress v9 and below (using Legacy configuration) ~~~~~~~~~~~~~~~~~~~ #
 
-  basic-pnpm-ubuntu-20:
+  basic-pnpm-ubuntu-20-v9:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -31,7 +31,7 @@ jobs:
           # see https://on.cypress.io/command-line#cypress-info
           build: npx cypress info
 
-  basic-pnpm-ubuntu-22:
+  basic-pnpm-ubuntu-22-v9:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -48,7 +48,7 @@ jobs:
           working-directory: examples/v9/basic-pnpm
           build: npx cypress info
 
-  basic-pnpm-on-windows:
+  basic-pnpm-on-windows-v9:
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -65,7 +65,7 @@ jobs:
           working-directory: examples/v9/basic-pnpm
           build: npx cypress info
 
-  basic-pnpm-on-mac:
+  basic-pnpm-on-mac-v9:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -85,7 +85,7 @@ jobs:
   # 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:
+  basic-pnpm-without-binary-install-v9:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -109,7 +109,7 @@ jobs:
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cypress v10 and higher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 
-  basic-pnpm-ubuntu-20-v10:
+  basic-pnpm-ubuntu-20:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -127,13 +127,13 @@ jobs:
         # the parameters below are only necessary
         # because we are running these examples in a monorepo
         with:
-          working-directory: examples/v10/basic-pnpm
+          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-v10:
+  basic-pnpm-ubuntu-22:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -147,10 +147,10 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic-pnpm
+          working-directory: examples/basic-pnpm
           build: npx cypress info
 
-  basic-pnpm-on-windows-v10:
+  basic-pnpm-on-windows:
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -164,10 +164,10 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic-pnpm
+          working-directory: examples/basic-pnpm
           build: npx cypress info
 
-  basic-pnpm-on-mac-v10:
+  basic-pnpm-on-mac:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -181,13 +181,13 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic-pnpm
+          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-v10:
+  basic-pnpm-without-binary-install:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -201,7 +201,7 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic-pnpm
+          working-directory: examples/basic-pnpm
           # since we do not install Cypress
           # we should not attempt to run tests
           runTests: false

diff --git a/.github/workflows/example-basic.yml b/.github/workflows/example-basic.yml
@@ -5,9 +5,9 @@ on:
       - 'master'
   pull_request:
 jobs:
-  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cypress v9 and lower ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
+  # ~~~~~~~~~~~~~~~~~~ Cypress v9 and below (using Legacy configuration) ~~~~~~~~~~~~~~~~~~~ #
 
-  basic-ubuntu-20:
+  basic-ubuntu-20-v9:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -26,7 +26,7 @@ jobs:
           # see https://on.cypress.io/command-line#cypress-info
           build: npx cypress info
 
-  basic-ubuntu-22:
+  basic-ubuntu-22-v9:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -38,7 +38,7 @@ jobs:
           working-directory: examples/v9/basic
           build: npx cypress info
 
-  basic-on-windows:
+  basic-on-windows-v9:
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -50,7 +50,7 @@ jobs:
           working-directory: examples/v9/basic
           build: npx cypress info
 
-  basic-on-mac:
+  basic-on-mac-v9:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -65,7 +65,7 @@ jobs:
   # skips the binary installation
   # shows that the job should not fail
   # https://github.com/cypress-io/github-action/issues/327
-  basic-without-binary-install:
+  basic-without-binary-install-v9:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -84,7 +84,7 @@ jobs:
 
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cypress v10 and higher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 
-  basic-ubuntu-20-v10:
+  basic-ubuntu-20:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
@@ -97,13 +97,13 @@ jobs:
         # the parameters below are only necessary
         # because we are running these examples in a monorepo
         with:
-          working-directory: examples/v10/basic
+          working-directory: examples/basic
           # 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-ubuntu-22-v10:
+  basic-ubuntu-22:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -112,10 +112,10 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic
+          working-directory: examples/basic
           build: npx cypress info
 
-  basic-on-windows-v10:
+  basic-on-windows:
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -124,10 +124,10 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic
+          working-directory: examples/basic
           build: npx cypress info
 
-  basic-on-mac-v10:
+  basic-on-mac:
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -136,13 +136,13 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic
+          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-v10:
+  basic-without-binary-install:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -151,7 +151,7 @@ jobs:
       - name: Cypress tests
         uses: ./
         with:
-          working-directory: examples/v10/basic
+          working-directory: examples/basic
           # since we do not install Cypress
           # we should not attempt to run tests
           runTests: false

diff --git a/.github/workflows/example-chrome.yml b/.github/workflows/example-chrome.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
 jobs:
 
-  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cypress v9 and lower ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
+  # ~~~~~~~~~~~~~~~~~~ Cypress v9 and below (using Legacy configuration) ~~~~~~~~~~~~~~~~~~~ #
 
   tests-v9:
     runs-on: ubuntu-22.04
@@ -83,7 +83,7 @@ jobs:
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Cypress v10 and higher ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
 
-  tests-v10:
+  tests:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -96,40 +96,40 @@ jobs:
           # print information about detected browsers, etc
           # see https://on.cypress.io/command-line#cypress-info
           build: npx cypress info
-          working-directory: examples/v10/chrome
+          working-directory: examples/chrome
 
       - name: Electron
         uses: ./
         with:
-          working-directory: examples/v10/chrome
+          working-directory: examples/chrome
 
       # store screenshot captured during the test
       - uses: actions/upload-artifact@v3
         with:
-          name: screenshots-in-electron-v10
-          path: examples/v10/chrome/cypress/screenshots
+          name: screenshots-in-electron
+          path: examples/chrome/cypress/screenshots
 
       - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/v10/chrome
+        working-directory: examples/chrome
 
       - name: Chrome
         uses: ./
         with:
-          working-directory: examples/v10/chrome
+          working-directory: examples/chrome
           browser: chrome
 
       - uses: actions/upload-artifact@v3
         with:
-          name: screenshots-in-chrome-v10
-          path: examples/v10/chrome/cypress/screenshots
+          name: screenshots-in-chrome
+          path: examples/chrome/cypress/screenshots
 
       - uses: actions/upload-artifact@v3
         with:
-          name: video-in-chrome-v10
-          path: examples/v10/chrome/cypress/videos
+          name: video-in-chrome
+          path: examples/chrome/cypress/videos
 
       - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/v10/chrome
+        working-directory: examples/chrome
 
       # I wonder if GH Actions VM includes any of the tools that
       # can tell us the resolution of a video file
@@ -139,19 +139,19 @@ jobs:
       - name: Chrome headless
         uses: ./
         with:
-          working-directory: examples/v10/chrome
+          working-directory: examples/chrome
           browser: chrome
           headed: false
 
       - uses: actions/upload-artifact@v3
         with:
-          name: screenshots-in-headless-chrome-v10
-          path: examples/v10/chrome/cypress/screenshots
+          name: screenshots-in-headless-chrome
+          path: examples/chrome/cypress/screenshots
 
       - uses: actions/upload-artifact@v3
         with:
-          name: video-in-headless-chrome-v10
-          path: examples/v10/chrome/cypress/videos
+          name: video-in-headless-chrome
+          path: examples/chrome/cypress/videos
 
       - run: npx image-size cypress/screenshots/**/*.png
-        working-directory: examples/v10/chrome
+        working-directory: examples/chrome
diff --git a/.github/workflows/example-component-test.yml b/.github/workflows/example-component-test.yml
@@ -9,5 +9,5 @@ jobs:
       - name: Cypress run
         uses: cypress-io/github-action@v5
         with:
-          working-directory: examples/v10/component-tests
+          working-directory: examples/component-tests
           component: true