status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-02-16 15:47:21 +00:00
Code Issues Projects Releases Wiki Activity

build: drop 'consul' build tag for OSS build

Browse Source
This commit is contained in:
Frank Schroeder 2017-08-30 13:25:14 +02:00 committed by Frank Schröder
parent 831d84c940
commit f25632d6a1
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@ -9,7 +9,7 @@ GOTOOLS = \
github.com/axw/gocov/gocov \ github.com/axw/gocov/gocov \
gopkg.in/matm/v1/gocov-html gopkg.in/matm/v1/gocov-html
GOTAGS ?= consul GOTAGS ?=
GOFILES ?= $(shell go list ./... | grep -v /vendor/) GOFILES ?= $(shell go list ./... | grep -v /vendor/)
GOOS=$(shell go env GOOS) GOOS=$(shell go env GOOS)
GOARCH=$(shell go env GOARCH) GOARCH=$(shell go env GOARCH)

15
version/version.go
View File

@ -11,15 +11,16 @@ var (
GitCommit string GitCommit string
GitDescribe string GitDescribe string
// Release versions of the build. These will be filled in by one of the // The main version number that is being run at the moment.
// build tag-specific files.
// //
// Version must conform to the format expected by github.com/hashicorp/go-version // Version must conform to the format expected by github.com/hashicorp/go-version
// for tests to work. Otherwise, the metadata server will not be able to detect // for tests to work.
// the agent to be a server. The value must be >= '0.8.0' for autopilot to work. Version = "0.9.3"
// todo(fs): This still feels like a hack but at least the magic values are gone.
Version = "9.9.9" // A pre-release marker for the version. If this is "" (empty string)
VersionPrerelease = "unknown" // then it means that it is a final release. Otherwise, this is a pre-release
// such as "dev" (in development), "beta", "rc1", etc.
VersionPrerelease = "dev"
) )
// GetHumanVersion composes the parts of the version in a way that's suitable // GetHumanVersion composes the parts of the version in a way that's suitable

16
version/version_base.go
View File

@ -1,16 +0,0 @@
// +build consul
package version
// NOTE we rely on other "version_*.go" files to be lexically after
// "version_base.go" in order for this to get properly overridden. Be careful
// adding new versions and pick a name that will follow "version_base.go".
func init() {
// The main version number that is being run at the moment.
Version = "0.9.3"
// 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.
VersionPrerelease = "dev"
}