From 29bd4dbf0995f262ad38e630b2d19a33d3c6e844 Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Mon, 4 Apr 2016 09:49:38 -0700 Subject: [PATCH] Bump version and modify release script for 0.7.0-rc2 Signed-off-by: Nathan LeClaire --- script/release.sh | 4 ++-- version/version.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/release.sh b/script/release.sh index bd8d769dd6..216253b97d 100755 --- a/script/release.sh +++ b/script/release.sh @@ -6,7 +6,7 @@ PROJECT_URL="git@github.com:${GITHUB_USER}/${GITHUB_REPO}" function usage { echo "Usage: " - echo " GITHUB_TOKEN=XXXXX ${0} 0.6.x" + echo " GITHUB_TOKEN=XXXXX ${0} [X.Y.Z]" } function display { @@ -61,7 +61,7 @@ GITHUB_VERSION="v${VERSION}" RELEASE_DIR="$(dirname "$(git rev-parse --show-toplevel)")/release-${VERSION}" GITHUB_RELEASE_FILE="github-release-${VERSION}.md" -LAST_RELEASE_VERSION=$(git describe --abbrev=0 --tags) +LAST_RELEASE_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1)) checkError "Unable to find current version tag" display "Starting release from ${LAST_RELEASE_VERSION} to ${GITHUB_VERSION} on ${PROJECT_URL} with token ${GITHUB_TOKEN}" diff --git a/version/version.go b/version/version.go index 0e330a6c10..36d4416d0b 100644 --- a/version/version.go +++ b/version/version.go @@ -7,7 +7,7 @@ import ( var ( // Version should be updated by hand at each release - Version = "0.7.0-rc1" + Version = "0.7.0-rc2" // GitCommit will be overwritten automatically by the build system GitCommit = "HEAD"