From d4fa98de68b490f4854f4e08d86d1156418f92fb Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Thu, 18 May 2017 12:36:58 +0200 Subject: [PATCH] update version for rc1 --- scripts/dist.sh | 12 ++++++------ version/version.go | 8 +------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/scripts/dist.sh b/scripts/dist.sh index 14f0fef12..0f368de97 100755 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -19,12 +19,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" # Change into that dir because we expect that. cd "$DIR" -# Generate the tag. -if [ -z "$NOTAG" ]; then - echo "==> Tagging..." - git commit --allow-empty -a -m "Release v$VERSION" - git tag -a -m "Version $VERSION" "v${VERSION}" master -fi +## Generate the tag. +#if [ -z "$NOTAG" ]; then +# echo "==> Tagging..." +# git commit --allow-empty -a -m "Release v$VERSION" +# git tag -a -m "Version $VERSION" "v${VERSION}" master +#fi # Do a hermetic build inside a Docker container. docker build -t tendermint/tendermint-builder scripts/tendermint-builder/ diff --git a/version/version.go b/version/version.go index 8056ac708..60887d6f9 100644 --- a/version/version.go +++ b/version/version.go @@ -1,24 +1,18 @@ package version -import ( - "fmt" -) - const Maj = "0" const Min = "10" const Fix = "0" var ( // The full version string - Version = "0.10.0" + Version = "0.10.0-rc1" // GitCommit is set with --ldflags "-X main.gitCommit=$(git rev-parse HEAD)" GitCommit string ) func init() { - Version = fmt.Sprintf("%d.%d.%d", Maj, Min, Fix) - if GitCommit != "" { Version += "-" + GitCommit[:8] }