From af1609eea30e560c45fd3319040714e04e1e865b Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Fri, 22 Feb 2019 15:49:11 -0600 Subject: [PATCH] SWS-1055 - Polishing. --- ci/README.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/README.adoc b/ci/README.adoc index 9c8bf98b..9895c546 100644 --- a/ci/README.adoc +++ b/ci/README.adoc @@ -27,14 +27,14 @@ WARNING: Do NOT check this file into source control! If you'll check, `credentia With this in place, run the following `fly` commands to create pipelines: ---- -% fly -t spring-team sp -p spring-ws -c ci/pipeline-template.yml -l credentials.yml -v branch=master -v release-branch=release +% fly -t spring-team sp -p spring-ws-2.x -c ci/pipeline-template.yml -l credentials.yml -v branch=2.x -v release-branch=release-2.x ---- With these pipelines in place, you can now activate and expose them: ---- -% fly -t spring-team unpause-pipeline -p spring-ws -% fly -t spring-team expose-pipeline -p spring-ws +% fly -t spring-team unpause-pipeline -p spring-ws-2.x +% fly -t spring-team expose-pipeline -p spring-ws-2.x ---- === Making a release @@ -46,9 +46,9 @@ With these pipelines in place, you can now activate and expose them: 2. With the release tagged, push the tagged version to the release branch. ---- -% git checkout -b release +% git checkout -b release-2.x % git reset --hard -% git push -f origin release +% git push -f origin release-2.x ---- NOTE: You can chain the previous set of commands together using `&&`. \ No newline at end of file