From 1c9ee3102adfbe99d7d45848f69926268c0376a6 Mon Sep 17 00:00:00 2001
From: Pawan <pawan@mayadata.io>
Date: Mon, 16 Mar 2020 18:14:01 +0530
Subject: [PATCH] feat(version): Makefile and version enhancement

Make to run go test for executing  unit test cases.

Removed version file, now if travis tag is set,
the VERSION will be set to that tag. And if travis
tag is not set, the driver version will be set to

 <branch-name>:<short commit hash>:<build date>

Signed-off-by: Pawan <pawan@mayadata.io>
---
 Makefile              |  6 ++++--
 VERSION               |  1 -
 buildscripts/build.sh | 19 ++++++++++++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)
 delete mode 100644 VERSION

diff --git a/Makefile b/Makefile
index 14d203a..6703118 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 # list only csi source code directories
 PACKAGES = $(shell go list ./... | grep -v 'vendor\|pkg/generated')
 
+UNIT_TEST_PACKAGES = $(shell go list ./... | grep -v 'vendor\|pkg/generated\|tests')
+
 # Lint our code. Reference: https://golang.org/cmd/vet/
 VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \
          -nilfunc -printf -rangeloops -shift -structtags -unsafeptr
@@ -36,7 +38,7 @@ CSI_DRIVER=zfs-driver
 BUILD_DATE = $(shell date +'%Y%m%d%H%M%S')
 
 .PHONY: all
-all: zfs-driver-image
+all: test zfs-driver-image
 
 .PHONY: clean
 clean:
@@ -54,7 +56,7 @@ format:
 .PHONY: test
 test: format
 	@echo "--> Running go test" ;
-	@go test $(PACKAGES)
+	@go test $(UNIT_TEST_PACKAGES)
 
 # Bootstrap downloads tools required
 # during build
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 8f0916f..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.5.0
diff --git a/buildscripts/build.sh b/buildscripts/build.sh
index 7a7b2a3..2821d87 100755
--- a/buildscripts/build.sh
+++ b/buildscripts/build.sh
@@ -24,8 +24,25 @@ if [[ -n "$TRAVIS_TAG" ]] && [[ $TRAVIS_TAG != *"RC"* ]]; then
     echo "released" > BUILDMETA
 fi
 
+CURRENT_BRANCH=""
+if [ -z ${TRAVIS_BRANCH} ];
+then
+  CURRENT_BRANCH=$(git branch | grep \* | cut -d ' ' -f2)
+else
+  CURRENT_BRANCH=${TRAVIS_BRANCH}
+fi
+
 # Get the version details
-VERSION="$(cat $GOPATH/src/github.com/openebs/zfs-localpv/VERSION)"
+if [ -n "$TRAVIS_TAG" ]; then
+	VERSION="$(git describe --tags `git rev-list --tags --max-count=1`)"
+else
+	BUILDDATE=`date +%m-%d-%Y`
+	SHORT_COMMIT="$(git rev-parse --short HEAD)"
+	VERSION="$CURRENT_BRANCH-$SHORT_COMMIT:$BUILDDATE"
+fi
+
+echo -e "\nbuilding the ZFS Driver version :- $VERSION\n"
+
 VERSION_META="$(cat $GOPATH/src/github.com/openebs/zfs-localpv/BUILDMETA)"
 
 # Determine the arch/os combos we're building for