Merge pull request #1529 from prometheus/fabxc/goversion
Use runtime.Version()
This commit is contained in:
commit
2c19334715
|
@ -22,7 +22,6 @@ revision=$( git rev-parse --short HEAD 2> /dev/null || echo 'unknown' )
|
|||
branch=$( git rev-parse --abbrev-ref HEAD 2> /dev/null || echo 'unknown' )
|
||||
host=$( hostname )
|
||||
build_date=$( TZ=UTC date +%Y%m%d-%H:%M:%S )
|
||||
go_version=$( go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/' )
|
||||
|
||||
if [ "$(go env GOOS)" = "windows" ]; then
|
||||
ext=".exe"
|
||||
|
@ -34,7 +33,6 @@ ldflags="
|
|||
-X ${repo_path}/version.Branch=${branch}
|
||||
-X ${repo_path}/version.BuildUser=${USER}@${host}
|
||||
-X ${repo_path}/version.BuildDate=${build_date}
|
||||
-X ${repo_path}/version.GoVersion=${go_version}
|
||||
${EXTRA_LDFLAGS}"
|
||||
|
||||
export GO15VENDOREXPERIMENT="1"
|
||||
|
|
|
@ -13,7 +13,11 @@
|
|||
|
||||
package version
|
||||
|
||||
import "github.com/prometheus/client_golang/prometheus"
|
||||
import (
|
||||
"runtime"
|
||||
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
)
|
||||
|
||||
// Build information. Populated at build-time.
|
||||
var (
|
||||
|
@ -22,7 +26,7 @@ var (
|
|||
Branch string
|
||||
BuildUser string
|
||||
BuildDate string
|
||||
GoVersion string
|
||||
GoVersion = runtime.Version()
|
||||
)
|
||||
|
||||
// Map provides the iterable version information.
|
||||
|
|
Loading…
Reference in New Issue