From 79b5c6b5afdbe1a55a0cb54ad49ad8d1667c652e Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 25 Apr 2025 12:13:40 +0200 Subject: [PATCH] [platform] Use devel versions notation for HelmCharts Signed-off-by: Andrei Kvapil --- packages/system/Makefile | 2 +- scripts/common-envs.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/system/Makefile b/packages/system/Makefile index e40b0bf1..2031c3a0 100644 --- a/packages/system/Makefile +++ b/packages/system/Makefile @@ -5,7 +5,7 @@ include ../../scripts/common-envs.mk repo: rm -rf "$(OUT)" mkdir -p "$(OUT)" - helm package -d "$(OUT)" $$(find . -mindepth 2 -maxdepth 2 -name Chart.yaml | awk 'sub("/Chart.yaml", "")') --version $(VERSION) + helm package -d "$(OUT)" $$(find . -mindepth 2 -maxdepth 2 -name Chart.yaml | awk 'sub("/Chart.yaml", "")') --version $(COZYSTACK_VERSION) cd "$(OUT)" && helm repo index . fix-chartnames: diff --git a/scripts/common-envs.mk b/scripts/common-envs.mk index 78e5e8a1..99bc29eb 100644 --- a/scripts/common-envs.mk +++ b/scripts/common-envs.mk @@ -1,7 +1,7 @@ REGISTRY := ghcr.io/cozystack/cozystack PUSH := 1 LOAD := 0 -VERSION = $(patsubst v%,%,$(shell git describe --tags --abbrev=0)) +COZYSTACK_VERSION = $(patsubst v%,%,$(shell git describe --tags)) TAG = $(shell git describe --tags --exact-match 2>/dev/null || echo latest) # Returns 'latest' if the git tag is not assigned, otherwise returns the provided value @@ -9,8 +9,8 @@ define settag $(if $(filter $(TAG),latest),latest,$(1)) endef -ifeq ($(VERSION),) +ifeq ($(COZYSTACK_VERSION),) $(shell git remote add upstream https://github.com/cozystack/cozystack.git || true) $(shell git fetch upstream --tags) - VERSION = $(patsubst v%,%,$(shell git describe --tags --abbrev=0)) + COZYSTACK_VERSION = $(patsubst v%,%,$(shell git describe --tags)) endif