diff --git a/Makefile b/Makefile index 330e158a4..e4745576c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ SHELL = /bin/bash -TAG := $(shell git describe --tags) +TAG := $(shell echo `git describe --tags`-`git rev-parse --abbrev-ref HEAD` | sed 's/-master$$//') LAST_TAG := $(shell git describe --tags --abbrev=0) NEW_TAG := $(shell echo $(LAST_TAG) | perl -lpe 's/v//; $$_ += 0.01; $$_ = sprintf("v%.2f", $$_)') @@ -7,6 +7,12 @@ rclone: @go version go install -v ./... +vars: + @echo SHELL="'$(SHELL)'" + @echo TAG="'$(TAG)'" + @echo LAST_TAG="'$(LAST_TAG)'" + @echo NEW_TAG="'$(NEW_TAG)'" + # Full suite of integration tests test: rclone go test ./...