chore: unify commit appending

Co-authored-by: Hilmar Falkenberg <hilmar.falkenberg@sap.com>
open-component-model · Nov 20, 2024 · 5d74e1f · 5d74e1f
1 parent f67f8eb
commit 5d74e1f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,6 @@ ifeq ($(EFFECTIVE_VERSION),)
 EFFECTIVE_VERSION                              := $(VERSION)+$(COMMIT)
 endif
 GIT_TREE_STATE                                 := $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
-COMMIT                                         := $(shell git rev-parse --verify HEAD)
 
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen

diff --git a/components/helmdemo/Makefile b/components/helmdemo/Makefile
@@ -13,7 +13,7 @@ COMMIT                                         = $(shell git rev-parse --verify
 # if EFFECTIVE_VERSION is not set, set it to VERSION-COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string
 ifeq ($(EFFECTIVE_VERSION),)
-EFFECTIVE_VERSION                              := $(VERSION)-$(COMMIT)
+EFFECTIVE_VERSION                              := $(VERSION)+$(COMMIT)
 endif
 HELMINSTVERSION                               ?= $(VERSION)
 

diff --git a/components/helminstaller/Makefile b/components/helminstaller/Makefile
@@ -14,7 +14,7 @@ COMMIT                                         := $(shell git rev-parse --verify
 # if EFFECTIVE_VERSION is not set, set it to VERSION-COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string
 ifeq ($(EFFECTIVE_VERSION),)
-EFFECTIVE_VERSION                              := $(VERSION)-$(COMMIT)
+EFFECTIVE_VERSION                              := $(VERSION)+$(COMMIT)
 endif
 GIT_TREE_STATE                                 := $(shell [ -z "$$(git status --porcelain 2>/dev/null)" ] && echo clean || echo dirty)
 PLATFORM                                       := $(shell go env GOOS)/$(shell go env GOARCH)

diff --git a/components/subchartsdemo/Makefile b/components/subchartsdemo/Makefile
@@ -18,7 +18,7 @@ COMMIT                                         = $(shell git rev-parse --verify
 # if EFFECTIVE_VERSION is not set, set it to VERSION-COMMIT
 # this is not the same as '?=' because it will also set the value if EFFECTIVE_VERSION is set to an empty string
 ifeq ($(EFFECTIVE_VERSION),)
-EFFECTIVE_VERSION                              := $(VERSION)-$(COMMIT)
+EFFECTIVE_VERSION                              := $(VERSION)+$(COMMIT)
 endif
 HELMINSTVERSION                               ?= $(VERSION)
 

diff --git a/examples/make/Makefile b/examples/make/Makefile
@@ -4,7 +4,7 @@ OCI_REPO := ghcr.io/mandelsoft/cnudie
 REPO_ROOT                                      := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 VERSION                                        = $(shell cat $(REPO_ROOT)/VERSION)
 COMMIT                                         = $(shell git rev-parse --verify HEAD)
-EFFECTIVE_VERSION                              = $(VERSION)-$(COMMIT)
+EFFECTIVE_VERSION                              = $(VERSION)+$(COMMIT)
 
 .PHONY: ctf
 ctf: ca ## Create CTF from component archive