From 91ab75991dacec5591a5d4dac44f60726eff7c83 Mon Sep 17 00:00:00 2001 From: Jake Champlin Date: Mon, 22 May 2017 11:28:15 -0400 Subject: [PATCH] core: use codified default for prerelease string --- scripts/build.sh | 4 ++-- terraform/version.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index e6a7cb3b8..3986c1db8 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -40,11 +40,11 @@ fi export CGO_ENABLED=0 # Allow LD_FLAGS to be appended during development compilations -LD_FLAGS="-X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY} -X github.com/hashicorp/terraform/terraform.VersionPrerelease=dev $LD_FLAGS" +LD_FLAGS="-X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY} $LD_FLAGS" # In release mode we don't want debug information in the binary if [[ -n "${TF_RELEASE}" ]]; then - LD_FLAGS="-X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY} -s -w" + LD_FLAGS="-X main.GitCommit=${GIT_COMMIT}${GIT_DIRTY} -X github.com/hashicorp/terraform/terraform.VersionPrerelease= -s -w" fi # Build! diff --git a/terraform/version.go b/terraform/version.go index 55357acd5..181c1aa72 100644 --- a/terraform/version.go +++ b/terraform/version.go @@ -12,7 +12,7 @@ const Version = "0.9.6" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release // such as "dev" (in development), "beta", "rc1", etc. -var VersionPrerelease string +var VersionPrerelease = "dev" // SemVersion is an instance of version.Version. This has the secondary // benefit of verifying during tests and init time that our version is a