status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2192 from hashicorp/f-short-sha 

Switches to the short form of the SHA for the build info.
This commit is contained in:
James Phillips 2016-07-19 15:20:12 -07:00 committed by GitHub
parent 40e433358e e96eedd9e2
commit eedccc4ca0
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/build.sh
View File

@ -15,7 +15,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
cd "$DIR" cd "$DIR"
# Get the git commit # Get the git commit
GIT_COMMIT="$(git rev-parse HEAD)" GIT_COMMIT="$(git rev-parse --short HEAD)"
GIT_DIRTY="$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)" GIT_DIRTY="$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)"
GIT_DESCRIBE="$(git describe --tags --always)" GIT_DESCRIBE="$(git describe --tags --always)"

1
version.go
View File

@ -30,7 +30,6 @@ func GetVersion() string {
if GitDescribe == "" && release == "" { if GitDescribe == "" && release == "" {
release = "dev" release = "dev"
} }
if release != "" { if release != "" {
version += fmt.Sprintf("-%s", release) version += fmt.Sprintf("-%s", release)
if GitCommit != "" { if GitCommit != "" {