Merge branch '9.0-release' into add-config-validation

cypress-io · Nov 8, 2021 · d97e70f · d97e70f
2 parents 84f53d1 + fc83e64
commit d97e70f
Show file tree

Hide file tree

Showing 55 changed files with 692 additions and 376 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -327,10 +327,6 @@ The project utilizes [yarn workspaces](https://yarnpkg.com/lang/en/docs/workspac
 > **⚠ Running on Windows?**
 >
 > Many of the NPM scripts used during development use commands designed for a Linux-like shell.If you are running a Windows operating system, you may encounter many commands that are not working. To fix this behavior, you have to set a Linux-like shell as the default `npm` script shell. If you have Git for Windows installed, you can set Git Bash as the default script shell by using the following command:
-> ```bash
-> yarn config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
-> ```
-> Git Bash may be installed in `Program Files`, if so, use the following command:
 >```bash
 > yarn config set script-shell "C:\\Program Files\\git\\bin\\bash.exe"
 >```

diff --git a/__snapshots__/upload-spec.js b/__snapshots__/upload-spec.js
@@ -5,18 +5,12 @@ exports['test runner manifest'] = {
     "mac": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
     },
-    "win": {
-      "url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
-    },
     "linux64": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
     },
     "darwin": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/darwin-x64/cypress.zip"
     },
-    "win32": {
-      "url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
-    },
     "linux": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
     },
@@ -26,9 +20,6 @@ exports['test runner manifest'] = {
     "linux-x64": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/linux-x64/cypress.zip"
     },
-    "win32-ia32": {
-      "url": "https://cdn.cypress.io/desktop/3.3.0/win32-ia32/cypress.zip"
-    },
     "win32-x64": {
       "url": "https://cdn.cypress.io/desktop/3.3.0/win32-x64/cypress.zip"
     }

diff --git a/__snapshots__/util-upload-spec.js b/__snapshots__/util-upload-spec.js
@@ -9,10 +9,6 @@ exports['upload util isValidPlatformArch checks given strings second 1'] = {
       "given": "linux-x64",
       "expect": true
     },
-    {
-      "given": "win32-ia32",
-      "expect": true
-    },
     {
       "given": "win32-x64",
       "expect": true

diff --git a/appveyor.yml b/appveyor.yml
@@ -2,7 +2,7 @@ branches:
   only:
     - master
     - develop
-    - fix-test-other-projects
+    - 9.0-release
     - /win*/
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/
@@ -38,7 +38,6 @@ environment:
 
 platform:
   - x64
-  - x86
 
 # https://www.appveyor.com/docs/build-cache/
 # hmm, seems there is NPM on windows problem

diff --git a/circle.yml b/circle.yml
@@ -8,7 +8,7 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - tgriesser/chore/fix-release
+        - 9.0-release
 
 defaults: &defaults
   parallelism: 1
@@ -42,7 +42,7 @@ onlyMainBranches: &onlyMainBranches
     branches:
       only:
         - develop
-        - tgriesser/chore/fix-release
+        - 9.0-release
   requires:
     - create-build-artifacts
 
@@ -838,7 +838,7 @@ commands:
           paths:
             - cypress/binary-url.json
 
-  build-npm-package:
+  build-cypress-npm-package:
     steps:
       - run:
           name: bump NPM version
@@ -857,13 +857,12 @@ commands:
       - run:
           name: pack NPM package
           working_directory: cli/build
-          command: yarn pack
+          command: yarn pack --filename cypress.tgz
       - run:
           name: list created NPM package
           working_directory: cli/build
           command: ls -l
-      # created file should have filename cypress-<version>.tgz
-      - run: cp cli/build/cypress-v*.tgz cypress.tgz
+      - run: cp cli/build/cypress.tgz cypress.tgz
       - store-npm-logs
       - run: pwd
       - run: ls -l
@@ -1501,11 +1500,11 @@ jobs:
     steps:
       - restore_cached_workspace
       - build-binary
-      - build-npm-package
+      - build-cypress-npm-package
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/chore/fix-release" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "9.0-release" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -2146,7 +2145,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - build
     - test-kitchensink:
@@ -2158,7 +2157,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - build
     - create-build-artifacts:
@@ -2208,15 +2207,15 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - create-build-artifacts
     - test-npm-module-and-verify-binary:
         filters:
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - create-build-artifacts
     - test-binary-against-staging:
@@ -2225,7 +2224,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - create-build-artifacts
 
@@ -2250,7 +2249,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - create-build-artifacts
 
@@ -2322,7 +2321,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 
@@ -2334,7 +2333,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - tgriesser/chore/fix-release
+              - 9.0-release
         requires:
           - darwin-create-build-artifacts
 

diff --git a/cli/__snapshots__/download_spec.js b/cli/__snapshots__/download_spec.js
@@ -28,7 +28,7 @@ URL: https://download.cypress.io/desktop?platform=OS&arch=ARCH
 
 ----------
 
-Platform: darwin (Foo-OsVersion)
+Platform: darwin-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 
 `

diff --git a/cli/__snapshots__/errors_spec.js b/cli/__snapshots__/errors_spec.js
@@ -5,7 +5,7 @@ a solution
 
 ----------
 
-Platform: test platform (Foo-OsVersion)
+Platform: test platform-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 `
 
@@ -22,7 +22,7 @@ If you are using Docker, we provide containers with all required dependencies in
 
 ----------
 
-Platform: test platform (Foo-OsVersion)
+Platform: test platform-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 `
 
@@ -35,6 +35,7 @@ exports['errors individual has the following errors 1'] = [
   "incompatibleHeadlessFlags",
   "invalidCacheDirectory",
   "invalidCypressEnv",
+  "invalidOS",
   "invalidRunProjectPath",
   "invalidSmokeTestDisplayError",
   "invalidTestingType",
@@ -68,7 +69,7 @@ Please refer to the error above for more detail.
 
 ----------
 
-Platform: test platform (Foo-OsVersion)
+Platform: test platform-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 `
 
@@ -92,6 +93,6 @@ Consider opening a new issue.
 
 ----------
 
-Platform: test platform (Foo-OsVersion)
+Platform: test platform-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 `
diff --git a/cli/__snapshots__/install_spec.js b/cli/__snapshots__/install_spec.js
@@ -142,7 +142,7 @@ EACCES: permission denied, mkdir '/invalid'
 
 ----------
 
-Platform: darwin (Foo-OsVersion)
+Platform: darwin-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 
 `
@@ -246,3 +246,14 @@ Installing Cypress (version: 1.2.3)
   - npm install --save-dev cypress
 
 `
+
+exports['error when installing on unsupported os'] = `
+Error: The Cypress App could not be installed. Your machine does not meet the operating system requirements.
+
+https://on.cypress.io/guides/getting-started/installing-cypress#system-requirements
+
+----------
+
+Platform: win32-ia32
+
+`
diff --git a/cli/__snapshots__/spawn_spec.js b/cli/__snapshots__/spawn_spec.js
@@ -30,6 +30,6 @@ Consider opening a new issue.
 
 ----------
 
-Platform: darwin (Foo-OsVersion)
+Platform: darwin-x64 (Foo-OsVersion)
 Cypress Version: 0.0.0-development
 `
diff --git a/cli/__snapshots__/unzip_spec.js b/cli/__snapshots__/unzip_spec.js
@@ -11,7 +11,7 @@ Error: end of central directory record signature not found
 
 ----------
 
-Platform: darwin (Foo-OsVersion)
+Platform: darwin-x64 (Foo-OsVersion)
 Cypress Version: 1.2.3
 
 `