From af714e5dae4b516f8ad0b14d594969aaef76e0a1 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 12 Oct 2018 06:42:12 -0700 Subject: Fix version string not showing properly Due to a typo, the output of `gitlab-pages -version` was always `dev` instead of the actual version. The variable name is VERSION, not Version. Closes https://gitlab.com/gitlab-org/gitlab-pages/issues/140 --- Makefile.internal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.internal.mk') diff --git a/Makefile.internal.mk b/Makefile.internal.mk index 1cbb09ed..e7d0e8fe 100644 --- a/Makefile.internal.mk +++ b/Makefile.internal.mk @@ -7,7 +7,7 @@ ifneq (v$(VERSION),$(LAST_TAG)) VERSION := $(shell echo $(VERSION)~beta.$(COMMITS).g$(REVISION)) endif -VERSION_FLAGS := -ldflags='-X "main.Version=$(VERSION)" -X "main.REVISION=$(REVISION)"' +VERSION_FLAGS := -ldflags='-X "main.VERSION=$(VERSION)" -X "main.REVISION=$(REVISION)"' # cd into the GOPATH to workaround ./... not following symlinks _allpackages = $(shell ( cd $(CURDIR)/.GOPATH/src/$(IMPORT_PATH) && \ -- cgit v1.2.3