From 2dbff02767a0e754c78878610c712f657bfe391c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 21 Jun 2021 14:37:58 -0400 Subject: [PATCH] Add ability to force tag Signed-off-by: Sebastian Malton --- Makefile | 2 +- scripts/tag-release.sh | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f2c9d0eb13..883968feda 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ release-version: .PHONY: tag-release tag-release: - scripts/tag-release.sh + scripts/tag-release.sh $(CMD_ARGS) .PHONY: test test: binaries/client diff --git a/scripts/tag-release.sh b/scripts/tag-release.sh index 82b7f14e6c..ce2ddffb2b 100755 --- a/scripts/tag-release.sh +++ b/scripts/tag-release.sh @@ -1,10 +1,21 @@ #!/bin/bash +while [[ $# -gt 0 ]]; do + key="$1" + + case $key in + -f|--force) + FORCE="--force" + shift # past argument + ;; + esac +done + if [[ `git branch --show-current` =~ ^release/v ]] then VERSION_STRING=$(cat package.json | jq '.version' -r | xargs printf "v%s") - git tag ${VERSION_STRING} - git push ${GIT_REMOTE:-origin} ${VERSION_STRING} + git tag ${VERSION_STRING} ${FORCE} + git push ${GIT_REMOTE:-origin} ${VERSION_STRING} ${FORCE} else echo "You must be in a release branch" fi