From 16e9997969dae71406bc537f3c5afc8834fbbdaf Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Sat, 18 May 2024 13:08:29 -0700 Subject: [PATCH] Properly fixing make tag --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f5c40919..13c544c2 100755 --- a/Makefile +++ b/Makefile @@ -121,6 +121,6 @@ prod: node_modules gems ## Build production assets and start in prod m tag: ## Tag this main with the .version - @/usr/bin/env bash -c "git tag | grep -q $(TAG) && { echo 'Tag $(TAG) is already assigned.'; exit 1; }" - @/usr/bin/env bash -c "if [[ $(BRANCH) != main ]]; then echo 'Must be on the main branch'; else echo git tag -f $(TAG); echo git push --tags --force; fi" + @/usr/bin/env bash -c "git tag | grep -q '$(TAG)' && { echo 'Tag $(TAG) is already assigned.'; exit 1; } || true" + @/usr/bin/env bash -c "if [[ $(BRANCH) != main ]]; then echo 'Must be on the main branch'; else git tag -f '$(TAG)'; git push --tags --force; fi"