Browse Source

add make version on gitea version (#6485)

tags/v1.9.0-rc1
Lunny Xiao 5 years ago
parent
commit
0a8e63c682
2 changed files with 18 additions and 9 deletions
  1. 3
    1
      Makefile
  2. 15
    8
      main.go

+ 3
- 1
Makefile View File

GOFLAGS := -i -v GOFLAGS := -i -v
EXTRA_GOFLAGS ?= EXTRA_GOFLAGS ?=


MAKE_VERSION := $(shell make -v | head -n 1)

ifneq ($(DRONE_TAG),) ifneq ($(DRONE_TAG),)
VERSION ?= $(subst v,,$(DRONE_TAG)) VERSION ?= $(subst v,,$(DRONE_TAG))
GITEA_VERSION ?= $(VERSION) GITEA_VERSION ?= $(VERSION)
GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')
endif endif


LDFLAGS := -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"
LDFLAGS := -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)"


PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))) PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/)))
SOURCES ?= $(shell find . -name "*.go" -type f) SOURCES ?= $(shell find . -name "*.go" -type f)

+ 15
- 8
main.go View File

"github.com/urfave/cli" "github.com/urfave/cli"
) )


// Version holds the current Gitea version
var Version = "1.5.0-dev"

// Tags holds the build tags used
var Tags = ""
var (
// Version holds the current Gitea version
Version = "1.9.0-dev"
// Tags holds the build tags used
Tags = ""
// MakeVersion holds the current Make version if built with make
MakeVersion = ""
)


func init() { func init() {
setting.AppVer = Version setting.AppVer = Version
} }
} }


func formatBuiltWith(Tags string) string {
func formatBuiltWith(makeTags string) string {
var version = runtime.Version()
if len(MakeVersion) > 0 {
version = MakeVersion + ", " + runtime.Version()
}
if len(Tags) == 0 { if len(Tags) == 0 {
return " built with " + runtime.Version()
return " built with " + version
} }


return " built with " + runtime.Version() + " : " + strings.Replace(Tags, " ", ", ", -1)
return " built with " + version + " : " + strings.Replace(Tags, " ", ", ", -1)
} }

Loading…
Cancel
Save