Merge branch 'dev/v1.0.x' into master

scrtlabs · Oct 20, 2020 · 4457a4e · 4457a4e
2 parents fb7f13b + ee1d464
commit 4457a4e
Show file tree

Hide file tree

Showing 3 changed files with 185 additions and 57 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 PACKAGES=$(shell go list ./... | grep -v '/simulation')
 VERSION ?= $(shell echo $(shell git describe --tags) | sed 's/^v//')
 COMMIT := $(shell git log -1 --format='%H')
-CURRENT_BRANCH := $(shell git branch --show-current)
+CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 LEDGER_ENABLED ?= true
 BINDIR ?= $(GOPATH)/bin
 BUILD_PROFILE ?= release