From bd7f364a3c8d781c9ca7557e0315caece14da946 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Thu, 30 May 2019 23:34:59 -0700 Subject: [PATCH] Fix clean and inject version --- core/poller/Makefile | 8 +++++--- core/poller/cmd/unifi-poller/config.go | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/poller/Makefile b/core/poller/Makefile index 452012e6..05d22d7c 100644 --- a/core/poller/Makefile +++ b/core/poller/Makefile @@ -1,20 +1,22 @@ PACKAGES=`find ./cmd -mindepth 1 -maxdepth 1 -type d` BINARY=unifi-poller +VERSION=`git tag -l --merged | tail -n1` all: clean man build clean: for p in $(PACKAGES); do rm -f `echo $${p}|cut -d/ -f3`{,.1,.1.gz}; done rm -rf package_build unifi-poller_*.deb unifi-poller-*.rpm unifi-poller-*.pkg + rm -f unifi-poller.*.gz build: - for p in $(PACKAGES); do go build -ldflags "-w -s" $${p}; done + for p in $(PACKAGES); do go build -ldflags "-w -s -X main.Version=$(VERSION)" $${p}; done linux: - for p in $(PACKAGES); do GOOS=linux go build -ldflags "-w -s" $${p}; done + for p in $(PACKAGES); do GOOS=linux go build -ldflags "-w -s -X main.Version=$(VERSION)" $${p}; done darwin: - for p in $(PACKAGES); do GOOS=darwin go build -ldflags "-w -s" $${p}; done + for p in $(PACKAGES); do GOOS=darwin go build -ldflags "-w -s -X main.Version=$(VERSION)" $${p}; done test: lint for p in $(PACKAGES) $(LIBRARYS); do go test -race -covermode=atomic $${p}; done diff --git a/core/poller/cmd/unifi-poller/config.go b/core/poller/cmd/unifi-poller/config.go index eea65377..44b84be1 100644 --- a/core/poller/cmd/unifi-poller/config.go +++ b/core/poller/cmd/unifi-poller/config.go @@ -2,8 +2,8 @@ package main import "time" -// Version is loosely followed. -var Version = "v1.1.1" +// Version is injected by the Makefile +var Version = "development" const ( // App defaults in case they're missing from the config.