diff --git a/Makefile b/Makefile index 75aef7f3cf..ae049d0086 100644 --- a/Makefile +++ b/Makefile @@ -9,8 +9,9 @@ BINDATA := $(shell find conf | sed 's/ /\\ /g') STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less) JAVASCRIPTS := -LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildTime=$(DATE)" -LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildGitHash=$(SHA)" +VERSION = $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') + +LDFLAGS += -X "main.Version=$(VERSION)" TARGETS ?= linux/*,darwin/*,windows/* PACKAGES ?= $(shell go list ./... | grep -v /vendor/) diff --git a/main.go b/main.go index 3383400082..620378491a 100644 --- a/main.go +++ b/main.go @@ -18,7 +18,7 @@ import ( ) // Version holds the current Gitea version -const Version = "0.9.99.0915" +var Version = "1.0.0+dev" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7e3bfb47ba..ece149a0ce 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -53,10 +53,6 @@ const ( // settings var ( - // BuildTime information should only be set by -ldflags. - BuildTime string - BuildGitHash string - // AppVer settings AppVer string AppName string @@ -642,11 +638,6 @@ var logLevels = map[string]string{ func newLogService() { log.Info("%s %s", AppName, AppVer) - if len(BuildTime) > 0 { - log.Info("Build Time: %s", BuildTime) - log.Info("Build Git Hash: %s", BuildGitHash) - } - // Get and check log mode. LogModes = strings.Split(Cfg.Section("log").Key("MODE").MustString("console"), ",") LogConfigs = make([]string, len(LogModes))