From d10a668ffc4ed2a81a8a62ee78f0885ede713ddd Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Mon, 18 Mar 2019 22:29:07 -0400 Subject: [PATCH] Make the version within makefile overwriteable (#6080) Fix #1173 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bd599b791..23da149d7 100644 --- a/Makefile +++ b/Makefile @@ -25,14 +25,14 @@ EXTRA_GOFLAGS ?= ifneq ($(DRONE_TAG),) VERSION ?= $(subst v,,$(DRONE_TAG)) - GITEA_VERSION := $(VERSION) + GITEA_VERSION ?= $(VERSION) else ifneq ($(DRONE_BRANCH),) VERSION ?= $(subst release/v,,$(DRONE_BRANCH)) else VERSION ?= master endif - GITEA_VERSION := $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') + GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') endif LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"