fix: app version and variable location

This commit is contained in:
James Houlahan 2020-04-23 08:21:59 +00:00 committed by Jakub Cuth
parent 0589f329e9
commit bb5227c1f4
2 changed files with 2 additions and 2 deletions

View File

@ -11,7 +11,7 @@ BUILD_TIME:=$(shell date +%FT%T%z)
BUILD_TAGS?=pmapi_prod
BUILD_FLAGS:=-tags='${BUILD_TAGS}'
BUILD_FLAGS_NOGUI:=-tags='${BUILD_TAGS} nogui'
GO_LDFLAGS:=$(addprefix -X main.,Version=${BRIDGE_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
GO_LDFLAGS:=$(addprefix -X github.com/ProtonMail/proton-bridge/pkg/constants.,Version=${BRIDGE_VERSION} Revision=${REVISION} BuildTime=${BUILD_TIME})
ifneq "${BUILD_LDFLAGS}" ""
GO_LDFLAGS+= ${BUILD_LDFLAGS}
endif

View File

@ -1,7 +1,7 @@
.PHONY: check-has-go install-godog test test-live test-debug test-live-debug
export GO111MODULE=on
export BRIDGE_VERSION:=dev-integrationtests
export BRIDGE_VERSION:=1.2.7-integrationtests
export VERBOSITY?=fatal
export TEST_DATA=testdata