Merge pull request #90 from AlexNPavel/makefix

build: fix version handling

Author: AlexNPavel

Makefile

@@ -1,7 +1,7 @@
 export CGO_ENABLED:=0
 
-VERSION=$(shell ./git-version)
-LD_FLAGS="-w -X github.com/coreos/container-linux-config-transpiler/version.Raw=$(VERSION)"
+VERSION=$(shell git describe --dirty)
+LD_FLAGS="-w -X github.com/coreos/container-linux-config-transpiler/internal/version.Raw=$(VERSION)"
 
 REPO=github.com/coreos/container-linux-config-transpiler
 

build

@@ -2,34 +2,39 @@
 
 set -eu
 
-source ./build
+ORG_PATH="github.com/coreos"
+REPO_PATH="${ORG_PATH}/container-linux-config-transpiler"
+
+if [ ! -h gopath/src/${REPO_PATH} ]; then
+	mkdir -p gopath/src/${ORG_PATH}
+	ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
+fi
+
+export GOPATH=${PWD}/gopath
 
 SRC=$(find . -name '*.go' \
 	-not -path "./vendor/*")
 
-PKG=$(cd gopath/src/${REPO_PATH}; go list ./... | \
-	grep --invert-match vendor)
-
-# https://github.com/golang/go/issues/15067
-PKG_VET=$(cd gopath/src/${REPO_PATH}; go list ./... | \
-	grep --invert-match vendor | \
-	grep --invert-match internal/log)
+PKGS=$(cd gopath/src/${REPO_PATH}; go list ./... | \
+	grep --invert-match /vendor)
+FORMATTABLE=$(cd gopath/src/${REPO_PATH}; ls -d */ | \
+	grep --invert-match --extended-regexp '(vendor/)')
 
 echo "Checking gofix..."
 go tool fix -diff $SRC
 
 echo "Checking gofmt..."
-res=$(gofmt -d -e -s $SRC)
-echo "${res}"
-if [ -n "${res}" ]; then
-	exit 1
+fmtRes=$(gofmt -l $FORMATTABLE)
+if [ -n "${fmtRes}" ]; then
+  echo -e "gofmt checking failed:\n${fmtRes}"
+  exit 2
 fi
 
 echo "Checking govet..."
-go vet $PKG_VET
+go vet $PKGS
 
 echo "Running tests..."
-go test -timeout 60s -cover $@ ${PKG}
+go test $PKGS -cover
 
 echo "Checking documentation..."
 go run internal/util/tools/docs.go