Merge pull request #521 from cypress-io/bring-back-commits

Bring back commits

circle.yml

@@ -382,6 +382,29 @@ jobs:
           key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
       - run: npm run binary-deploy -- --platform linux --version $NEXT_LINUX_BINARY_VERSION
 
+  "test-binary":
+    <<: *defaults
+    steps:
+      - restore_cache:
+          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+      # build NPM package
+      - run: cd cli && npm run build
+      - run: mkdir test-binary
+      - run:
+          name: Create new NPM package
+          working_directory: test-binary
+          command: npm init -y
+      - run:
+          # install NPM from built NPM package folder
+          name: Install Cypress
+          working_directory: test-binary
+          # force installing the freshly built binary
+          command: CYPRESS_BINARY_VERSION=$NEXT_LINUX_BINARY_VERSION npm i ../cli/build
+      - run:
+          name: Verify Cypress binary
+          working_directory: test-binary
+          command: $(npm bin)/cypress verify
+
 workflows:
   version: 2
   build_and_test:
@@ -438,12 +461,15 @@ workflows:
       - desktop-gui-integration-tests-3:
           requires:
             - build
-      - build-binary:
-          requires:
-            - build
       - run-launcher:
           requires:
             - build
+      - build-binary:
+          requires:
+            - build
+      - test-binary:
+          requires:
+            - build-binary
 
 #
 # things to run in the 4th CI container

package.json

@@ -27,7 +27,7 @@
     "precommit-lint": "eslint --fix",
     "prepush": "npm run stop-only",
     "stop-only": "stop-only packages --exclude-dir .cy --exclude-dir .projects --exclude-dir node_modules --exclude-dir dist --exclude-dir dist-test --exclude-dir fixtures --exclude-dir lib --exclude-dir bower_components",
-    "bump": "gulp bump",
+    "bump": "node ./scripts/binary.js bump",
     "binary-build": "node ./scripts/binary.js build",
     "binary-zip": "node ./scripts/binary.js zip",
     "binary-upload": "node ./scripts/binary.js upload",

packages/launcher/lib/windows/index.ts

@@ -77,7 +77,7 @@ function getWindowsBrowser(
 
   return pathExists(exePath)
     .then(exists => {
-      console.log('found %s ?', exePath, exists)
+      log('found %s ?', exePath, exists)
       if (!exists) {
         throw notInstalledErr(`Browser ${name} file not found at ${exePath}`)
       }

scripts/binary/ask.coffee

@@ -92,7 +92,7 @@ getBumpTasks = ->
     type: "list"
     message: "Which bump task?"
     choices: [{
-      name: "Bump Cypress Version for all CI providers"
+      name: "Bump Cypress Binary Version for all CI providers"
       value: "version"
     },{
       name: "Run All Projects for all CI providers"
@@ -120,10 +120,10 @@ whichZipFile = ->
 whichVersion = (distDir) ->
   ## realpath returns the absolute full path
   glob("*/package.json", {cwd: distDir, realpath: true})
-  .map (pkg) =>
+  .map (pkg) ->
     fs.readJsonAsync(pkg)
     .get("version")
-  .then (versions) =>
+  .then (versions) ->
     versions = _.uniq(versions)
 
     prompt(getVersions(versions))

scripts/binary/bump.coffee

@@ -6,33 +6,37 @@ path      = require("path")
 
 fs = Promise.promisifyAll(fs)
 
+car = null
+
 PROVIDERS = {
   circle: [
-    "cypress-io/cypress-dashboard"
-    "cypress-io/cypress-core-example"
-    "cypress-io/cypress-core-desktop-gui"
-    "cypress-io/cypress-example-kitchensink"
-    "cypress-io/cypress-example-todomvc"
-    "cypress-io/cypress-example-piechopper"
-    "cypress-io/cypress-example-recipes"
-    "cypress-io/cypress-example-node-versions"
-    "cypress-io/cypress-example-module-api"
+    # "cypress-io/cypress-dashboard"
+    # "cypress-io/cypress-core-example"
+    # "cypress-io/cypress-core-desktop-gui"
+    # "cypress-io/cypress-example-kitchensink"
+    # "cypress-io/cypress-example-todomvc"
+    # "cypress-io/cypress-example-piechopper"
+    # "cypress-io/cypress-example-recipes"
+    "cypress-io/cypress-test-example-repos"
+    "cypress-io/cypress-test-node-versions"
+    "cypress-io/cypress-test-nested-projects"
+    "cypress-io/cypress-test-module-api"
     "cypress-io/cypress-test-ci-environments"
   ]
 
-  travis: [
-    # "cypress-io/cypress-dashboard"
-    "cypress-io/cypress-core-example"
-    "cypress-io/cypress-core-desktop-gui"
-    "cypress-io/cypress-example-kitchensink"
-    "cypress-io/cypress-example-todomvc"
-    "cypress-io/cypress-example-piechopper"
-    "cypress-io/cypress-example-recipes"
-  ]
+  # travis: [
+  #   # "cypress-io/cypress-dashboard"
+  #   "cypress-io/cypress-core-example"
+  #   "cypress-io/cypress-core-desktop-gui"
+  #   "cypress-io/cypress-example-kitchensink"
+  #   "cypress-io/cypress-example-todomvc"
+  #   "cypress-io/cypress-example-piechopper"
+  #   "cypress-io/cypress-example-recipes"
+  # ]
 }
 
 awaitEachProjectAndProvider = (fn) ->
-  ciJson = path.join(__dirname, "support/ci.json")
+  ciJson = path.join(__dirname, "support/.ci.json")
   creds = fs.readJsonSync(ciJson, "utf8")
 
   fs.readJsonAsync(ciJson)
@@ -58,7 +62,7 @@ module.exports = {
   version: (version) ->
     awaitEachProjectAndProvider (project, provider) ->
       car.updateProjectEnv(project, provider, {
-        CYPRESS_VERSION: version
+        CYPRESS_BINARY_VERSION: version
       })
 
   run: ->

scripts/binary/index.coffee

@@ -85,7 +85,7 @@ deploy = {
         when "run"
           bump.run()
         when "version"
-          ask.whichVersion(meta.distDir)
+          ask.whichVersion(meta.distDir(""))
           .then (v) ->
             bump.version(v)
 

scripts/run-all.js

@@ -158,8 +158,13 @@ module.exports = (cmd, options) => {
   })
   .then((dirs) => mapTasks(cmd, dirs))
   .then((tasks) => {
+    const runSerially = Boolean(options.serial)
+    if (runSerially) {
+      console.log('⚠️ running jobs serially')
+    }
+    const parallel = runSerially
     return runAll(tasks, {
-      parallel: !options.serial,
+      parallel,
       printLabel: tasks.length > 1,
       stdout: process.stdout,
       stderr: collectStderr,