From 6ac7ab38d6b346901d160362b7a72d4b95c8b971 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Tue, 6 May 2025 18:46:12 -0400 Subject: [PATCH] fix(make): correctement obtenir semver depuis `git describe` --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d28a4e8..5a095ad 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ .DEFAULT_GOAL := help +current_semver := $(shell git describe | tr -d 'v' | tr '.' ' ' | tr '-' ' ') + .PHONY: help help: ## Show this help @egrep -h '\s##\s' $(MAKEFILE_LIST) | \ @@ -37,8 +39,8 @@ deploy: build-container deploy-container ## Build and deploy agecem-org containe .PHONY: docker-tag-from-git docker-tag-from-git: ## Tag latest image according to annotated tag from `git describe` - ./scripts/docker-tag.sh $(git describe | tr -d 'v' | tr '.' ' ' | tr '-' ' ') + ./scripts/docker-tag.sh $(current_semver) .PHONY: docker-push-from-git docker-push-from-git: ## Push images to git.agecem.com according to annotated tag from `git describe` - ./scripts/docker-push.sh $(git describe | tr -d 'v' | tr '.' ' ' | tr '-' ' ') + ./scripts/docker-push.sh $(current_semver)