diff --git a/circle.yml b/circle.yml index f9ac9ea41..bae929df7 100644 --- a/circle.yml +++ b/circle.yml @@ -35,7 +35,7 @@ test: deployment: release: - tag: /[0-9]+(\.[0-9]+)*/ + tag: /v[0-9]+(\.[0-9]+)*/ commands: - bash ./scripts/deploy.sh diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 51336b44d..fd681fc7f 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -8,11 +8,11 @@ docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS deploy_tag() { # Find our individual versions from the tags - if [ -n "$(echo $CIRCLE_TAG | grep -E '.*\..*\..*')" ] + if [ -n "$(echo $CIRCLE_TAG | grep -E 'v.*\..*\..*')" ] then - major=$(echo $CIRCLE_TAG | cut -d. -f1) - minor=$(echo $CIRCLE_TAG | cut -d. -f2) - patch=$(echo $CIRCLE_TAG | cut -d. -f3) + major=$(echo ${CIRCLE_TAG//v} | cut -d. -f1) + minor=$(echo ${CIRCLE_TAG//v} | cut -d. -f2) + patch=$(echo ${CIRCLE_TAG//v} | cut -d. -f3) major_version_tag=$major minor_version_tag=$major.$minor