diff --git a/Earthfile b/Earthfile index de711d17..bc0bc6c0 100644 --- a/Earthfile +++ b/Earthfile @@ -70,6 +70,11 @@ build: # ./dist/all/assets.zip BUILD +assets +build-spn: + BUILD +go-build --CMDS="hub" --GOOS="linux" --GOARCH="amd64" + BUILD +go-build --CMDS="hub" --GOOS="linux" --GOARCH="arm64" + # TODO: Add other platforms + go-ci: BUILD +go-build --GOOS="linux" --GOARCH="amd64" BUILD +go-build --GOOS="linux" --GOARCH="arm64" diff --git a/base/info/version.go b/base/info/version.go index 91bad092..6c27096e 100644 --- a/base/info/version.go +++ b/base/info/version.go @@ -74,6 +74,7 @@ func Set(setName string, setVersion string, setLicenseName string) { if setVersion != "" { version = setVersion + versionNumber = setVersion } } diff --git a/cmds/hub/main.go b/cmds/hub/main.go index 3db002b3..74390f27 100644 --- a/cmds/hub/main.go +++ b/cmds/hub/main.go @@ -33,7 +33,7 @@ func main() { flag.Parse() // Set name and license. - info.Set("SPN Hub", "", "GPLv3") + info.Set("SPN Hub", "0.7.8", "GPLv3") // Configure metrics. _ = metrics.SetNamespace("hub") @@ -45,10 +45,6 @@ func main() { // Set SPN public hub mode. conf.EnablePublicHub(true) - // Set default log level. - log.SetLogLevel(log.WarningLevel) - _ = log.Start() - // Create instance. var execCmdLine bool instance, err := spn.New() @@ -79,6 +75,10 @@ func main() { os.Exit(0) } + // Set default log level. + log.SetLogLevel(log.WarningLevel) + _ = log.Start() + // Start go func() { err = instance.Start() diff --git a/spn/testing/simple/reset-databases.sh b/spn/testing/simple/reset-databases.sh index 79be6890..3c8a2d19 100755 --- a/spn/testing/simple/reset-databases.sh +++ b/spn/testing/simple/reset-databases.sh @@ -2,6 +2,6 @@ cd "$( dirname "${BASH_SOURCE[0]}" )" -rm -rf data/me/* -rm -rf data/shared/* -rm -rf data/hub*/databases +rm -rf testdata/me/* +rm -rf testdata/shared/* +rm -rf testdata/hub*/databases