From fc6fa052106ded5d88545c5ab42aa060c0155182 Mon Sep 17 00:00:00 2001 From: Simon Warta Date: Tue, 20 Sep 2022 10:07:09 +0200 Subject: [PATCH] Fix master -> main in CI config --- .circleci/config.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0767528e5..a94d0cb0b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,15 +161,17 @@ jobs: - run: name: Build Docker artifact command: docker build --pull -t "cosmwasm/wasmd:${CIRCLE_SHA1}" . - - run: - name: Push application Docker image to docker hub - command: | - if [ "${CIRCLE_BRANCH}" = "master" ]; then - docker tag "cosmwasm/wasmd:${CIRCLE_SHA1}" cosmwasm/wasmd:latest - docker login --password-stdin -u "$DOCKER_USER" \<<<"$DOCKER_PASS" - docker push cosmwasm/wasmd:latest - docker logout - fi + - when: + condition: + equal: [ main, << pipeline.git.branch >> ] + steps: + - run: + name: Push application Docker image to docker hub + command: | + docker tag "cosmwasm/wasmd:${CIRCLE_SHA1}" cosmwasm/wasmd:latest + docker login --password-stdin -u "$DOCKER_USER" \<<<"$DOCKER_PASS" + docker push cosmwasm/wasmd:latest + docker logout docker-tagged: executor: golang @@ -194,14 +196,14 @@ workflows: version: 2 test-suite: jobs: - # this is now a slow process... let's only run on master + # this is now a slow process... let's only run on main and PR branches we care about - docker-image: requires: - setup-dependencies filters: branches: only: - - master + - main - docker-tagged: filters: tags: