Skip to content

Commit

Permalink
feat(version): Makefile and version enhancement
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
pawanpraka1 authored and kmova committed Mar 16, 2020
1 parent 4c47dcf commit 1c9ee31
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 4 deletions.
6 changes: 4 additions & 2 deletions 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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

19 changes: 18 additions & 1 deletion buildscripts/build.sh
Expand Up @@ -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
Expand Down

0 comments on commit 1c9ee31

Please sign in to comment.