From 7497f681d524ecd18ce334cdc035b86dc6c0a0ee Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Mon, 16 Dec 2019 17:11:13 -0800 Subject: [PATCH] fixes --- .metadata.sh | 3 +-- Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.metadata.sh b/.metadata.sh index 7a78171d..5c380efc 100755 --- a/.metadata.sh +++ b/.metadata.sh @@ -38,7 +38,6 @@ VERSION="$(echo $VVERSION | tr -d v | grep -E '^\S+$' || echo development)" # This produces a 0 in some envirnoments (like Homebrew), but it's only used for packages. ITERATION=$(git rev-list --count --all || echo 0) DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)" -BRANCH="$(git rev-parse --abbrev-ref HEAD || echo unknown)" COMMIT="$(git rev-parse --short HEAD || echo 0)" # Used by homebrew downloads. @@ -46,4 +45,4 @@ COMMIT="$(git rev-parse --short HEAD || echo 0)" # This is a custom download path for homebrew formula. SOURCE_PATH=https://golift.io/${BINARY}/archive/v${VERSION}.tar.gz -export IMPORT_PATH SOURCE_URL URL VVERSION VERSION ITERATION DATE BRANCH COMMIT SOURCE_PATH +export IMPORT_PATH SOURCE_URL URL VVERSION VERSION ITERATION DATE COMMIT SOURCE_PATH diff --git a/Makefile b/Makefile index 30287041..ee12f5b2 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ endef PLUGINS:=$(patsubst plugins/%/main.go,%,$(wildcard plugins/*/main.go)) VERSION_LDFLAGS:= \ - -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Branch=$(BRANCH) \ + -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Branch=$(TRAVIS_BRANCH) \ -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.BuildDate=$(DATE) \ -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Revision=$(COMMIT) \ -X $(IMPORT_PATH)/vendor/github.com/prometheus/common/version.Version=$(VERSION)-$(ITERATION)