char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update version imprinting (#1462) 

* Add version tag constant

* Update build imprinting
main
Neil Alexander 2020-10-01 16:09:11 +01:00 committed by GitHub
parent dbae85283f
commit 7048532bc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.sh
View File

@ -3,10 +3,16 @@
# Put installed packages into ./bin # Put installed packages into ./bin
export GOBIN=$PWD/`dirname $0`/bin export GOBIN=$PWD/`dirname $0`/bin
export BRANCH=`(git symbolic-ref --short HEAD | cut -d'/' -f 3 )|| ""` if [ -d ".git" ]
export BUILD=`git rev-parse --short HEAD || ""` then
export BUILD=`git rev-parse --short HEAD || ""`
export BRANCH=`(git symbolic-ref --short HEAD | tr -d \/ ) || ""`
[[ $BRANCH == "master" ]] && export BRANCH=""
export FLAGS="-X github.com/matrix-org/dendrite/internal.branch=$BRANCH -X github.com/matrix-org/dendrite/internal.build=$BUILD" export FLAGS="-X github.com/matrix-org/dendrite/internal.branch=$BRANCH -X github.com/matrix-org/dendrite/internal.build=$BUILD"
else
export FLAGS=""
fi
go install -trimpath -ldflags "$FLAGS" -v $PWD/`dirname $0`/cmd/... go install -trimpath -ldflags "$FLAGS" -v $PWD/`dirname $0`/cmd/...

3
internal/version.go
View File

@ -12,10 +12,11 @@ const (
VersionMajor = 0 VersionMajor = 0
VersionMinor = 0 VersionMinor = 0
VersionPatch = 0 VersionPatch = 0
VersionTag = "" // example: "rc1"
) )
func VersionString() string { func VersionString() string {
version := fmt.Sprintf("%d.%d.%d", VersionMajor, VersionMinor, VersionPatch) version := fmt.Sprintf("%d.%d.%d%s", VersionMajor, VersionMinor, VersionPatch, VersionTag)
if branch != "" { if branch != "" {
version += fmt.Sprintf("-%s", branch) version += fmt.Sprintf("-%s", branch)
} }