diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e6162f2..c6c64abe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ jobs: - setup_remote_docker: docker_layer_caching: true - run: docker login -u _json_key -p "$GCR_JSON_KEY" us.gcr.io - - run: bin/deploy + - run: make release RELEASE_TAG="b$CIRCLE_BUILD_NUM" workflows: version: 2 @@ -29,6 +29,9 @@ workflows: - release_images: requires: - build_and_test + filters: + branches: + only: /master|channel\/[\w-]+/ notify: webhooks: - url: https://cc-slack-proxy.herokuapp.com/circle diff --git a/bin/deploy b/bin/deploy deleted file mode 100755 index ea7601f2..00000000 --- a/bin/deploy +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -set -e - -case "$CIRCLE_BRANCH" in - master) - make release \ - RELEASE_TAG="b$CIRCLE_BUILD_NUM" - ;; - *) - if [[ "$CIRCLE_BRANCH" =~ ^channel/[\w-]+ ]]; then - make release \ - RELEASE_TAG="b$CIRCLE_BUILD_NUM" - fi - ;; -esac