From a7f90905df12b649dd48d9b6b05e419ff47b2a7c Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Thu, 12 Jul 2018 06:32:01 +0300 Subject: [PATCH] Fix drone git@next plugin Gitea version display when building tag (#4380) --- Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index a4ca20e08..256e872ad 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,19 @@ GOFMT ?= gofmt -s GOFLAGS := -i -v EXTRA_GOFLAGS ?= -LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)" +ifneq ($(DRONE_TAG),) + VERSION ?= $(subst v,,$(DRONE_TAG)) + 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//') +endif + +LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/)) SOURCES ?= $(shell find . -name "*.go" -type f) @@ -45,16 +57,6 @@ else EXECUTABLE := gitea endif -ifneq ($(DRONE_TAG),) - VERSION ?= $(subst v,,$(DRONE_TAG)) -else - ifneq ($(DRONE_BRANCH),) - VERSION ?= $(subst release/v,,$(DRONE_BRANCH)) - else - VERSION ?= master - endif -endif - # $(call strip-suffix,filename) strip-suffix = $(firstword $(subst ., ,$(1)))