From fe14ab34aa8af6bbdbf56de141e06a45fe2aa66a Mon Sep 17 00:00:00 2001 From: Evan Hearne Date: Mon, 10 Jun 2024 11:45:16 +0100 Subject: [PATCH] added git dirty to make install target --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1aa17b3..956438d 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,8 @@ MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) PROJECT_PATH := $(patsubst %/,%,$(dir $(MKFILE_PATH))) GO ?= go KUADRANT_NAMESPACE=kuadrant-system -VERSION := $(shell git rev-parse --short=7 HEAD) +GIT_HASH := $(shell git rev-parse --short=7 HEAD) +GIT_DIRTY := $(shell git diff --stat) all: help @@ -56,8 +57,8 @@ test: clean-cov fmt vet $(GINKGO) ## install: Build and install kuadrantctl binary ($GOBIN or GOPATH/bin) .PHONY : install install: fmt vet -ifneq ($(VERSION),) - GOBIN=$(PROJECT_PATH)/bin $(GO) install -ldflags "-X 'github.com/kuadrant/kuadrantctl/version.Version=dev - $(VERSION)'" +ifneq ($(VERSION),$(GIT_DIRTY)) + GOBIN=$(PROJECT_PATH)/bin $(GO) install -ldflags "-X 'github.com/kuadrant/kuadrantctl/version.GitDirty=$(GIT_DIRTY)' -X 'github.com/kuadrant/kuadrantctl/version.GitHash=$(GIT_HASH)'" else GOBIN=$(PROJECT_PATH)/bin $(GO) install endif