wip: add branch filter
License: MIT Signed-off-by: Oli Evans <oli@tableflip.io>
Oli Evans committed
Mar 4, 2020 at 15:23 UTC
7c593bd84b56e7d78edeaeb49d0a9f552e20437d
2 files changed
+7
-3
.circleci/config.yml
+5
-1
@@ -369,7 +369,7 @@ workflows:
369
- go-ipfs-http-client
370
- ipfs-webui
371
372
- # NOTE: As we need to pass the tag filter to all dependent jobs, this is pulled out into a seperate workflow.
372
+ # NOTE: You have to opt in to get circleci to trigger builds for a tat. As it is required that you set the tag filter to all dependent jobs, this is pulled out into a seperate workflow.
373
# see: https://circleci.com/docs/2.0/workflows/#executing-workflows-for-a-git-tag
374
docker-on-tag:
375
jobs:
@@ -377,9 +377,13 @@ workflows:
377
filters:
378
tags:
379
only: /^v[0-9].*|^cluster.+/
380
+ branches:
381
+ ignore: /.*/
382
- docker-push:
383
requires:
384
- docker-build
385
filters:
386
tags:
387
only: /^v[0-9].*|^cluster.+/
388
+ branches:
389
+ ignore: /.*/
bin/push-docker-tags.sh
+2
-2
@@ -61,8 +61,8 @@ pushTag () {
61
if [[ $GIT_TAG =~ ^v[0-9]+ ]]; then
62
pushTag "$GIT_TAG"
63
64
-elif [[ $GIT_TAG =~ ^cluster ]]; then
65
- pushTag "$GIT_TAG"
64
+elif [[ $GIT_BRANCH =~ ^cluster ]]; then
65
+ pushTag "$GIT_BRANCH"
66
67
elif [ "$GIT_BRANCH" = "feat/stabilize-dht" ]; then
68
pushTag "bifrost-${BUILD_NUM}-${GIT_SHA1_SHORT}"