Value injection at build time seems to only work for the main package

This commit is contained in:
Gabe Kangas 2020-06-24 12:55:49 -07:00
parent abb2f363af
commit a3273e9deb
3 changed files with 19 additions and 22 deletions

View File

@ -1,20 +0,0 @@
package core
import (
"fmt"
)
// the following are injected at build-time
var (
//GitCommit is the commit which this version of owncast is running
GitCommit = "unknown"
//BuildVersion is the version
BuildVersion = "0.0.0"
//BuildType is the type of build
BuildType = "localdev"
)
//GetVersion gets the version string
func GetVersion() string {
return fmt.Sprintf("Owncast v%s-%s (%s)", BuildVersion, BuildType, GitCommit)
}

19
main.go
View File

@ -1,6 +1,8 @@
package main
import (
"fmt"
log "github.com/sirupsen/logrus"
"github.com/gabek/owncast/config"
@ -8,9 +10,19 @@ import (
"github.com/gabek/owncast/router"
)
// the following are injected at build-time
var (
//GitCommit is the commit which this version of owncast is running
GitCommit = "unknown"
//BuildVersion is the version
BuildVersion = "0.0.0"
//BuildType is the type of build
BuildType = "localdev"
)
func main() {
// logrus.SetReportCaller(true)
log.Println(core.GetVersion())
log.Println(getVersion())
//TODO: potentially load the config from a flag like:
//configFile := flag.String("configFile", "config.yaml", "Config File full path. Defaults to current folder")
@ -31,3 +43,8 @@ func main() {
panic(err)
}
}
//getVersion gets the version string
func getVersion() string {
return fmt.Sprintf("Owncast v%s-%s (%s)", BuildVersion, BuildType, GitCommit)
}

View File

@ -50,7 +50,7 @@ build() {
cp -R doc/ dist/${NAME}/doc/
cp README.md dist/${NAME}
env CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH go build -ldflags "-X core.GitCommit=$GIT_COMMIT -X core.BuildVersion=$VERSION -X core.BuildType=$NAME" -a -o dist/$NAME/owncast
env CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH go build -ldflags "-X main.GitCommit=$GIT_COMMIT -X main.BuildVersion=$VERSION -X main.BuildType=$NAME" -a -o dist/$NAME/owncast
pushd dist/${NAME} >> /dev/null
zip -r -q -8 ../owncast-$NAME-$VERSION.zip .