From ed127ea795a064a89cbe5e7c03524cd8ac2db23e Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Thu, 31 Oct 2019 11:28:02 -0700 Subject: [PATCH] Fix bugs in CI set-up. (#144) --- .circleci/config.yml | 7 +++++-- .github/pull_request_template.md | 3 +++ scripts/publish.sh | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1b183d9..60db788d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,10 +21,13 @@ jobs: - run: helm init --client-only # Only actually publish charts on master. - run: | + set -x if [ "$CIRCLE_BRANCH" = "master" ]; then - echo 'export GIT_PUSH=true' >> $BASH_ENV + export GIT_PUSH=true + else + export GIT_PUSH=false fi - - run: sh ./scripts/publish.sh + sh ./scripts/publish.sh workflows: version: 2 workflow: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 08e3b47a..3f860547 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -4,3 +4,6 @@ Checklist: * [ ] Any new values are backwards compatible and/or have sensible default. * [ ] I have followed the testing instructions in the [contributing guide](https://github.com/argoproj/argo-helm/blob/master/CONTRIBUTING.md). * [ ] I have signed the CLA and the build is green. +* [ ] I will test my changes again once merged to master and published. + +Changes are automatically published when merged to `master`. They are not published on branches. \ No newline at end of file diff --git a/scripts/publish.sh b/scripts/publish.sh index 8b943495..40c5e66c 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -2,7 +2,7 @@ set -eux SRCROOT="$(cd "$(dirname "$0")/.." && pwd)" -GIT_PUSH=${GIT_PUSH:-true} +GIT_PUSH=${GIT_PUSH:-false} rm -rf $SRCROOT/output && git clone -b gh-pages git@github.com:argoproj/argo-helm.git $SRCROOT/output