Skip to content

Commit

Permalink
Fix for go-gitea#828
Browse files Browse the repository at this point in the history
Add build tags to ldflags and print in version output

Signed-off-by: Jonas Östanbäck <jonas.ostanback@gmail.com>
  • Loading branch information
cez81 committed Feb 25, 2017
1 parent c0ea396 commit dafa5a4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BINDATA := modules/{options,public,templates}/bindata.go
STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
JAVASCRIPTS :=

LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')"
LDFLAGS := -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')" -X "main.Tags=$(TAGS)"

TARGETS ?= linux/*,darwin/*,windows/*
PACKAGES ?= $(shell go list ./... | grep -v /vendor/)
Expand Down
13 changes: 12 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package main // import "code.gitea.io/gitea"

import (
"os"
"strings"

"code.gitea.io/gitea/cmd"
"code.gitea.io/gitea/modules/log"
Expand All @@ -18,6 +19,9 @@ import (
// Version holds the current Gitea version
var Version = "1.1.0+dev"

// Tags holds the build tags used
var Tags = ""

func init() {
setting.AppVer = Version
}
Expand All @@ -26,7 +30,7 @@ func main() {
app := cli.NewApp()
app.Name = "Gitea"
app.Usage = "A painless self-hosted Git service"
app.Version = Version
app.Version = Version + formatBuiltWith(Tags)
app.Commands = []cli.Command{
cmd.CmdWeb,
cmd.CmdServ,
Expand All @@ -42,3 +46,10 @@ func main() {
}

}

func formatBuiltWith(Tags string) string {
if len(Tags) > 0 {
return " built with: " + strings.Join(strings.Split(Tags, " "), ", ")
}
return ""
}

0 comments on commit dafa5a4

Please sign in to comment.