Merge branch 'master' into add-16.17.0

cypress-io · Sep 1, 2022 · 1368579 · 1368579
2 parents 61bc10c + d0be07b
commit 1368579
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 41 deletions.
diff --git a/circle.yml b/circle.yml
@@ -61,14 +61,6 @@ commands:
                       echo "Testing using Electron browser"
                       docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c "./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run"
 
-                      if [[ "$(node -p process.arch)" == 'arm64' ]]; then
-                        echo "Chrome does not support arm64 yet, skipping"
-                        exit 0
-                      fi
-
-                      echo "Testing using Chrome browser"
-                      docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c "./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run --browser chrome"
-
     test-browser-image:
         description: Build a test image from browser image and test it
         parameters:
@@ -456,4 +448,4 @@ workflows:
                 context: test-runner:docker-push
                 requires:
                     - "build+test base 16.17.0 arm64"
-                    - "build+test base 16.17.0 x64"
+                    - "build+test base 16.17.0 x64"
diff --git a/scripts/__tests__/__snapshots__/generate-config-snapshots.test.js.snap b/scripts/__tests__/__snapshots__/generate-config-snapshots.test.js.snap
@@ -64,14 +64,6 @@ commands:
                       echo \\"Testing using Electron browser\\"
                       docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c \\"./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run\\"
 
-                      if [[ \\"$(node -p process.arch)\\" == 'arm64' ]]; then
-                        echo \\"Chrome does not support arm64 yet, skipping\\"
-                        exit 0
-                      fi
-
-                      echo \\"Testing using Chrome browser\\"
-                      docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c \\"./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run --browser chrome\\"
-
     test-browser-image:
         description: Build a test image from browser image and test it
         parameters:
@@ -526,14 +518,6 @@ commands:
                       echo \\"Testing using Electron browser\\"
                       docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c \\"./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run\\"
 
-                      if [[ \\"$(node -p process.arch)\\" == 'arm64' ]]; then
-                        echo \\"Chrome does not support arm64 yet, skipping\\"
-                        exit 0
-                      fi
-
-                      echo \\"Testing using Chrome browser\\"
-                      docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c \\"./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run --browser chrome\\"
-
     test-browser-image:
         description: Build a test image from browser image and test it
         parameters:
@@ -992,14 +976,6 @@ commands:
                       echo \\"Testing using Electron browser\\"
                       docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c \\"./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run\\"
 
-                      if [[ \\"$(node -p process.arch)\\" == 'arm64' ]]; then
-                        echo \\"Chrome does not support arm64 yet, skipping\\"
-                        exit 0
-                      fi
-
-                      echo \\"Testing using Chrome browser\\"
-                      docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c \\"./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run --browser chrome\\"
-
     test-browser-image:
         description: Build a test image from browser image and test it
         parameters:

diff --git a/scripts/includes/circle-header.yml b/scripts/includes/circle-header.yml
@@ -61,14 +61,6 @@ commands:
                       echo "Testing using Electron browser"
                       docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c "./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run"
 
-                      if [[ "$(node -p process.arch)" == 'arm64' ]]; then
-                        echo "Chrome does not support arm64 yet, skipping"
-                        exit 0
-                      fi
-
-                      echo "Testing using Chrome browser"
-                      docker run -it -v $PWD:/e2e -w /e2e << parameters.imageName >> sh -c "./node_modules/.bin/cypress install && ./node_modules/.bin/cypress run --browser chrome"
-
     test-browser-image:
         description: Build a test image from browser image and test it
         parameters: