From 58978f58f376dc1e837218b0fd2520dc6a2a07c9 Mon Sep 17 00:00:00 2001
From: Ben Wilson <ben@z.cash>
Date: Mon, 6 Apr 2020 15:34:29 -0400
Subject: [PATCH] Added Makefile version vars

---
 Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1391cbc..257bef1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,10 @@
 SHELL := /bin/bash
 
-VERSION := $(CI_COMMIT_TAG)
-GITCOMMIT := $(git rev-list -1 HEAD)
-BRANCH := $(CI_COMMIT_BRANCH)
+VERSION := `git describe --always`
+GITCOMMIT := `git rev-parse HEAD`
+BRANCH := `git rev-parse --abbrev-ref HEAD`
 BUILDDATE := `date +%Y-%m-%d`
 BUILDUSER := `whoami`
-PROJECT_ROOT := github.com/benzcash/cloudlog
 
 LDFLAGSSTRING :=-X main.Version=$(VERSION)
 LDFLAGSSTRING +=-X main.GitCommit=$(GITCOMMIT)