From bbf01dde2b05f33fc7d7847e1c18673516c13354 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Thu, 31 Oct 2019 11:04:14 -0700 Subject: [PATCH] changes on circleci to .circleci/config.yml,CONTRIBUTING.md, --- .circleci/config.yml | 6 +++--- CONTRIBUTING.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1eedc93b..a1b183d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,13 +15,13 @@ jobs: steps: # install the additional keys needed to push to Github. Alex Collins owns these keys. - add_ssh_keys - - checkout - - run: helm init --client-only - run: git config --global user.email "nobody@circleci.com" - run: git config --global user.name "Circle CI Build" + - checkout + - run: helm init --client-only # Only actually publish charts on master. - run: | - if [ "$CIRCLE_BRANCH" = "circleci" ]; then + if [ "$CIRCLE_BRANCH" = "master" ]; then echo 'export GIT_PUSH=true' >> $BASH_ENV fi - run: sh ./scripts/publish.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e6370aeb..528deb77 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,7 @@ argocd app sync guestbook ## Publishing Changes -To push changes use following script: +Changes are automatically publish whenever a commit is merged to master. The CI job (see `.circleci/config.yaml`) runs this: ``` GIT_PUSH=true ./scripts/publish.sh