Tune Makefile

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
sylr · Jul 10, 2021 · 1174dc2 · 1174dc2
1 parent ebb2bbd
commit 1174dc2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -32,8 +32,8 @@ kustomize-binary: $(KUSTOMIZE_SRC) kustomize-git-reset
 	for platform in $(PLATFORMS); do \
 	  GOOS=$$(cut -d / -f1 <<<$$platform); \
 	  GOARCH=$$(cut -d / -f2 <<<$$platform); \
-	  OUTPUT=$$(basename $$PWD)-$$GOOS-$$GOARCH-$$(git rev-parse --short=8 HEAD); \
+	  OUTPUT=$$(basename $$PWD)-$$(git describe --tags  | cut -d '/' -f2)-$$GOOS-$$GOARCH; \
 	  test "$$GOOS" == "windows" && OUTPUT=$${OUTPUT}.exe; \
-	  GOOS=$$GOOS GOARCH=$$GOARCH go build -ldflags="-s -X sigs.k8s.io/kustomize/api/provenance.version=$(shell git -C "$(KUSTOMIZE_SRC)/.." describe --tags | cut -d '/' -f2) -X sigs.k8s.io/kustomize/api/provenance.gitCommit=$(shell git -C "$(KUSTOMIZE_SRC)/.." rev-parse HEAD) -X sigs.k8s.io/kustomize/api/provenance.buildDate=$(shell date -u +%FT%TZ)" -trimpath -o $$OUTPUT .; \
+	  GOOS=$$GOOS GOARCH=$$GOARCH go build -ldflags="-s -X sigs.k8s.io/kustomize/api/provenance.version=$$(git describe --tags | cut -d '/' -f2) -X sigs.k8s.io/kustomize/api/provenance.gitCommit=$$(git rev-parse HEAD) -X sigs.k8s.io/kustomize/api/provenance.buildDate=$(shell date -u +%FT%TZ)" -trimpath -o $$OUTPUT .; \
 	  cp $$OUTPUT $(CURDIR)/bin; \
 	done