wip: add branch filter

License: MIT
Signed-off-by: Oli Evans <oli@tableflip.io>
This commit is contained in:
Oli Evans 2020-03-04 15:23:44 +00:00
parent 8ff47e550c
commit 7c593bd84b
No known key found for this signature in database
GPG Key ID: A2AC979DA8460535
2 changed files with 7 additions and 3 deletions

View File

@ -369,7 +369,7 @@ workflows:
- go-ipfs-http-client
- ipfs-webui
# NOTE: As we need to pass the tag filter to all dependent jobs, this is pulled out into a seperate workflow.
# 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.
# see: https://circleci.com/docs/2.0/workflows/#executing-workflows-for-a-git-tag
docker-on-tag:
jobs:
@ -377,9 +377,13 @@ workflows:
filters:
tags:
only: /^v[0-9].*|^cluster.+/
branches:
ignore: /.*/
- docker-push:
requires:
- docker-build
filters:
tags:
only: /^v[0-9].*|^cluster.+/
branches:
ignore: /.*/

View File

@ -61,8 +61,8 @@ pushTag () {
if [[ $GIT_TAG =~ ^v[0-9]+ ]]; then
pushTag "$GIT_TAG"
elif [[ $GIT_TAG =~ ^cluster ]]; then
pushTag "$GIT_TAG"
elif [[ $GIT_BRANCH =~ ^cluster ]]; then
pushTag "$GIT_BRANCH"
elif [ "$GIT_BRANCH" = "feat/stabilize-dht" ]; then
pushTag "bifrost-${BUILD_NUM}-${GIT_SHA1_SHORT}"