From 3227f0aa5be1d64d2ec694bd3758e0d43e92b36b Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski <ayufan@ayufan.eu> Date: Thu, 22 Oct 2015 10:09:43 +0200 Subject: [PATCH] Fix 0.6.2 release --- CHANGELOG.md | 4 +++- Makefile | 6 +++--- VERSION | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae8ea97f2..bcc8d762f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ v 0.6.2 -- Fix PowerShell +- Fix PowerShell support +- Make more descriptive pulling message +- Add version check to Makefile v 0.6.1 - Revert: Fix tags handling when using git fetch: fetch all tags and prune the old ones diff --git a/Makefile b/Makefile index 131962a3f..1e0742dea 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,9 @@ help: check: ifeq ($(RELEASE),true) - ifneq ($VERSION,$LAST_TAG) - $(error Bad version specified in VERSION file) - endif +ifneq (v$(VERSION),$(LAST_TAG)) + $(error Bad version specified in VERSION file: v$(VERSION) instead of $(LAST_TAG)) +endif endif version: FORCE diff --git a/VERSION b/VERSION index 844f6a91a..b61604874 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.3 +0.6.2 -- GitLab