diff --git a/README.md b/README.md index 1e1ca42..e41af12 100644 --- a/README.md +++ b/README.md @@ -261,6 +261,6 @@ This section describes the release process for the orb itself: 1. Push the feature branch to Github to kick off the `lint-pack_validate_publish-dev` workflow in CircleCI. 1. When the `lint-pack_validate_publish-dev` workflow completes successfully, it will trigger the `integration-tests_prod-release` workflow to test the orb. 1. If the `integration-tests_prod-release` workflow passes, get review and merge to master. -1. Create a [GitHub Release](https://github.com/rainforestapp/rainforest-orb/releases/new) with the proper `v`-prefixed version tag (i.e. `v3.3.2`). List **Bugfixes**, **Breaking changes**, and **New features** (if present), with links to the PRs. See [previous releases](https://github.com/rainforestapp/rainforest-orb/releases) for an idea of the format we've been using. +1. Create a [GitHub Release](https://github.com/rainforestapp/rainforest-orb/releases/new) with the proper `v`-prefixed version tag (i.e. `v4.0.0`). List **Bugfixes**, **Breaking changes**, and **New features** (if present), with links to the PRs. See [previous releases](https://github.com/rainforestapp/rainforest-orb/releases) for an idea of the format we've been using. If you want to run an integration test against Rainforest, create a new branch in the Rainforest repo and update the `.circleci/config.yml` to use the dev version of the orb and add a job to kick-off a Rainforest run. diff --git a/Rakefile b/Rakefile index f7efcba..ca85d53 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ # frozen_string_literal: true -VERSION = Gem::Version.new('3.3.2') +VERSION = Gem::Version.new('4.0.0') def components # changes [1, 3] to [1, 3, 0] diff --git a/src/commands/run_qa.yml b/src/commands/run_qa.yml index e90b31d..76c96f4 100644 --- a/src/commands/run_qa.yml +++ b/src/commands/run_qa.yml @@ -63,7 +63,7 @@ steps: - run: name: Run Rainforest environment: - ORB_VERSION: 3.3.2 + ORB_VERSION: 4.0.0 command: | # Show Orb Version echo "Using Rainforest Orb v${ORB_VERSION}" @@ -79,7 +79,7 @@ steps: # Validate conflict if [ -n "<< parameters.conflict >>" ] ; then - if ! echo "cancel cancel-all abort abort-all" | grep -Eq "\b"<< parameters.conflict >>"\b" ; then + if ! echo "cancel cancel-all" | grep -Eq "\b"<< parameters.conflict >>"\b" ; then echo "Error: << parameters.conflict >> not in (cancel cancel-all)" exit 1 fi