build: use semantic commits to get next version (#14851)

Author: flotwig

DEPLOY.md

@@ -43,7 +43,6 @@ You can build the Cypress binary locally by running `yarn binary-build`. You can
 - Ensure you have the following permissions set up:
     - An AWS account with permission to create AWS access keys for the Cypress CDN.
     - Permissions for your npm account to publish the `cypress` package.
-    - Permissions to modify environment variables for `cypress` on CircleCI and AppVeyor.
     - Permissions to update releases in ZenHub.
 
 - Set up the following environment variables:
@@ -142,11 +141,10 @@ In the following instructions, "X.Y.Z" is used to denote the version of Cypress
     npm dist-tag add [email protected]
     ```
 
-9. Run `binary-release` to update the [download server's manifest](https://download.cypress.io/desktop.json) and set the next CI version:
+9. Run `binary-release` to update the [download server's manifest](https://download.cypress.io/desktop.json):
     ```shell
     yarn run binary-release --version X.Y.Z
     ```
-    > Note: Currently, there is an [issue setting the next CI version](https://github.com/cypress-io/cypress/issues/7176) that will cause this command to fail after setting the download manifest. You will need to manually update NEXT_DEV_VERSION by logging in to CircleCI and AppVeyor. This is noted in Step 16 below.
 
 10. If needed, push out any updated changes to the links manifest to [`on.cypress.io`](https://github.com/cypress-io/cypress-services/tree/develop/packages/on).
 
@@ -185,9 +183,7 @@ In the following instructions, "X.Y.Z" is used to denote the version of Cypress
 
 16. Publish a new docker image in [`cypress-docker-images`](https://github.com/cypress-io/cypress-docker-images) under `included` for the new cypress version.
 
-17. Decide on the next version that we will work on. For example, if we have just released `3.7.0` we probably will work on `3.7.1` next. Set it on [CI machines](#set-next-version-on-cis).
-
-18. Update example projects to the new version. For most projects, you can go to the Renovate dependency issue and check the box next to `Update dependency cypress to X.Y.Z`. It will automatically create a PR. Once it passes, you can merge it. Try updating at least the following projects:
+17. Update example projects to the new version. For most projects, you can go to the Renovate dependency issue and check the box next to `Update dependency cypress to X.Y.Z`. It will automatically create a PR. Once it passes, you can merge it. Try updating at least the following projects:
     - [cypress-example-todomvc](https://github.com/cypress-io/cypress-example-todomvc/issues/99)
     - [cypress-example-todomvc-redux](https://github.com/cypress-io/cypress-example-todomvc-redux/issues/1)
     - [cypress-example-realworld](https://github.com/cypress-io/cypress-example-realworld/issues/2)
@@ -199,7 +195,7 @@ In the following instructions, "X.Y.Z" is used to denote the version of Cypress
     - [cypress-documentation](https://github.com/cypress-io/cypress-documentation/issues/1313)
     - [cypress-example-docker-compose](https://github.com/cypress-io/cypress-example-docker-compose) - Doesn't have a Renovate issue, but will auto-create and auto-merge non-major Cypress updates as long as the tests pass.
 
-19. Check if any test or example repositories have a branch for testing the features or fixes from the newly published version `x.y.z`. The branch should also be named `x.y.z`. Check all `cypress-test-*` and `cypress-example-*` repositories, and if there is a branch named `x.y.z`, merge it into `master`.
+18. Check if any test or example repositories have a branch for testing the features or fixes from the newly published version `x.y.z`. The branch should also be named `x.y.z`. Check all `cypress-test-*` and `cypress-example-*` repositories, and if there is a branch named `x.y.z`, merge it into `master`.
 
     **Test Repos**
 

appveyor.yml

@@ -2,7 +2,7 @@ branches:
   only:
     - master
     - develop
-    - revert-create-cypress-tests
+    - sem-next-ver
     - /win*/
 
 # https://www.appveyor.com/docs/lang/nodejs-iojs/
@@ -54,7 +54,6 @@ install:
   - node --version
   - node --print process.arch
   - yarn --version
-  - yarn check-next-dev-version
   # prints all public variables relevant to the build
   - print-env Platform
   - yarn check-node-version
@@ -89,8 +88,8 @@ test_script:
   # make sure our snapshots are compared correctly
   # - npm run test-mocha-snapshot
   # the other larger tests
-  - echo *** Building Windows NPM package %NEXT_DEV_VERSION% ***
-  - npm --no-git-tag-version version %NEXT_DEV_VERSION%
+  - echo *** Building Windows NPM package ***
+  - yarn get-next-version --npm
   - cd cli
   - yarn
   - yarn build

circle.yml

@@ -8,8 +8,7 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - v6.0-release
-        - include-electron-node-version
+        - sem-next-ver
 
 defaults: &defaults
   parallelism: 1
@@ -36,7 +35,7 @@ testBinaryFirefox: &testBinaryFirefox
     branches:
       only:
         - develop
-        - v6.0-release
+        - sem-next-ver
   requires:
     - build-npm-package
     - build-binary
@@ -231,7 +230,7 @@ commands:
 
   clone-repo-and-checkout-release-branch:
     description: |
-      Clones an external repo and then checks out the branch that matches NEXT_DEV_VERSION otherwise uses 'master' branch.
+      Clones an external repo and then checks out the branch that matches the next version otherwise uses 'master' branch.
     parameters:
       repo:
         description: "Name of the github repo to clone like: cypress-example-kitchensink"
@@ -244,7 +243,7 @@ commands:
           name: "Cloning test project: <<parameters.repo>>"
           command: |
             git clone --depth 1 --no-single-branch https://github.com/cypress-io/<<parameters.repo>>.git /tmp/<<parameters.repo>>
-            cd /tmp/<<parameters.repo>> && (git checkout $NEXT_DEV_VERSION || true)
+            cd /tmp/<<parameters.repo>> && (git checkout $(node ./scripts/get-next-version) || true)
 
   test-binary-against-repo:
     description: |
@@ -1028,13 +1027,10 @@ jobs:
             DEBUG: electron-builder,electron-osx-sign*
           # notarization on Mac can take a while
           no_output_timeout: "45m"
-          # if this is a forked pull request, the NEXT_DEV_VERSION environment variable
-          # won't be set and we will use default version, since we are not going to
-          # upload the dev binary build anywhere
           command: |
             . ./scripts/load-nvm.sh
             node --version
-            yarn binary-build --platform $PLATFORM --version ${NEXT_DEV_VERSION:-0.0.0-development}
+            yarn binary-build --platform $PLATFORM --version $(node ./scripts/get-next-version)
       - run:
           name: Zip the binary
           command: |
@@ -1060,7 +1056,7 @@ jobs:
           command: |
             node scripts/binary.js upload-unique-binary \
               --file cypress.zip \
-              --version $NEXT_DEV_VERSION
+              --version $(node ./scripts/get-next-version)
       - run: cat binary-url.json
       - store-npm-logs
       - persist_to_workspace:
@@ -1139,14 +1135,9 @@ jobs:
           at: ~/
       - check-conditional-ci
       - install-required-node
-      - run:
-          name: Check next dev version
-          command: |
-            . ./scripts/load-nvm.sh
-            yarn check-next-dev-version
       - run:
           name: bump NPM version
-          command: yarn version --no-git-tag-version --new-version ${NEXT_DEV_VERSION:-0.0.0-development}
+          command: yarn get-next-version --npm
       - run:
           name: build NPM package
           command: |
@@ -1168,8 +1159,8 @@ jobs:
           command: ls -l
       # created file should have filename cypress-<version>.tgz
       - run: mkdir /tmp/urls
-      - run: cp cli/build/cypress-v${NEXT_DEV_VERSION:-0.0.0-development}.tgz cypress.tgz
-      - run: cp cli/build/cypress-v${NEXT_DEV_VERSION:-0.0.0-development}.tgz /tmp/urls/cypress.tgz
+      - run: cp cli/build/cypress-v*.tgz cypress.tgz
+      - run: cp cli/build/cypress-v*.tgz /tmp/urls/cypress.tgz
       - run: ls -l /tmp/urls
       - store-npm-logs
       - run: pwd
@@ -1192,7 +1183,7 @@ jobs:
           command: |
             node scripts/binary.js upload-npm-package \
               --file cypress.tgz \
-              --version $NEXT_DEV_VERSION
+              --version $(node ./scripts/get-next-version)
       - store-npm-logs
       - run: ls -l
       - run: cat npm-package-url.json
@@ -1817,7 +1808,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - build
     - test-kitchensink:
@@ -1835,7 +1826,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - build
     - build-npm-package:
@@ -1847,7 +1838,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - build-npm-package
     - build-binary:
@@ -1859,7 +1850,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - build-binary
     - test-npm-module-on-minimum-node-version:
@@ -1916,7 +1907,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - upload-npm-package
           - upload-binary
@@ -1926,7 +1917,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - upload-npm-package
           - upload-binary
@@ -1935,7 +1926,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - build-npm-package
           - build-binary
@@ -1945,7 +1936,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - build-npm-package
           - build-binary
@@ -1971,7 +1962,7 @@ linux-workflow: &linux-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - build-npm-package
           - build-binary
@@ -2065,7 +2056,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - Mac NPM package
           - Mac binary
@@ -2078,7 +2069,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - Mac NPM package upload
           - Mac binary upload
@@ -2091,7 +2082,7 @@ mac-workflow: &mac-workflow
           branches:
             only:
               - develop
-              - v6.0-release
+              - sem-next-ver
         requires:
           - Mac NPM package upload
           - Mac binary upload

package.json

@@ -14,7 +14,6 @@
     "build": "lerna run build --stream",
     "build-prod": "lerna run build-prod --stream",
     "bump": "node ./scripts/binary.js bump",
-    "check-next-dev-version": "node scripts/check-next-dev-version.js",
     "check-node-version": "node scripts/check-node-version.js",
     "check-terminal": "node scripts/check-terminal.js",
     "clean": "lerna run clean --parallel",
@@ -34,14 +33,14 @@
     "docker": "./scripts/run-docker-local.sh",
     "effective:circle:config": "circleci config process circle.yml | sed /^#/d",
     "ensure-deps": "./scripts/ensure-dependencies.sh",
+    "get-next-version": "node scripts/get-next-version.js",
     "postinstall": "./scripts/run-if-not-ci.sh yarn build",
     "jscodeshift": "jscodeshift -t ./node_modules/js-codemod/transforms/arrow-function-arguments.js",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json .",
     "lint-changed": "lint-changed",
     "move-binaries": "node ./scripts/binary.js move-binaries",
     "npm-release": "node scripts/npm-release.js",
     "semantic-release": "node ./scripts/semantic-release.js",
-    "set-next-ci-version": "node ./scripts/binary.js setNextVersion",
     "prestart": "yarn ensure-deps",
     "start": "node $(yarn bin cypress) open --dev --global",
     "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__ --exclude e2e.ts,cypress-tests.ts,unwritten.spec.ts",
@@ -118,6 +117,7 @@
     "check-dependencies": "1.1.0",
     "check-more-types": "2.24.0",
     "common-tags": "1.8.0",
+    "conventional-recommended-bump": "6.1.0",
     "debug": "4.3.1",
     "del": "3.0.0",
     "electron-builder": "22.9.1",

packages/server/test/support/helpers/performance.js

@@ -30,7 +30,6 @@ function track (type, data) {
       type,
       data: {
         'package.json Version': pkg.version,
-        'Next Version': process.env.NEXT_DEV_VERSION,
         'Commit SHA': sha,
         'Commit Branch': branch,
         'Commit Author': author,

scripts/binary/ask.js

@@ -3,7 +3,6 @@ let fs = require('fs-extra')
 let glob = require('glob')
 const Promise = require('bluebird')
 const inquirer = require('inquirer')
-const path = require('path')
 
 glob = Promise.promisify(glob)
 
@@ -85,32 +84,6 @@ const getReleases = (releases) => {
   }]
 }
 
-const getNextVersion = function ({ version } = {}) {
-  if (!version) {
-    ({
-      version,
-    } = require(path.join(__dirname, '..', '..', 'package.json')))
-  }
-
-  const message = `Bump next version to...? (currently: ${version})`
-  const defaultVersion = function () {
-    const a = version.split('.')
-    let v = a[a.length - 1]
-
-    v = Number(v) + 1
-    a.splice(a.length - 1, 1, v)
-
-    return a.join('.')
-  }
-
-  return [{
-    name: 'nextVersion',
-    type: 'input',
-    message,
-    default: defaultVersion,
-  }]
-}
-
 const getVersions = (releases) => {
   return [{
     name: 'version',
@@ -213,11 +186,6 @@ const whichBumpTask = () => {
   .get('task')
 }
 
-const nextVersion = (version) => {
-  return prompt(getNextVersion(version))
-  .get('nextVersion')
-}
-
 const toCommit = ({ version }) => {
   return prompt(getCommitVersion(version))
   .get('commit')
@@ -232,11 +200,9 @@ module.exports = {
   getVersions,
   getBumpTasks,
   deployNewVersion,
-  nextVersion,
   whichZipFile,
   whichVersion,
   whichRelease,
   whichPlatform,
   whichBumpTask,
-
 }