Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for #828: Embed build tags #1051

Merged
merged 5 commits into from
Feb 28, 2017
Merged

Fix for #828: Embed build tags #1051

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dafa5a4
Fix for #828
cez81 Feb 25, 2017
c6737ac
Reworked formatBuiltWith function
cez81 Feb 25, 2017
2f81c12
Add tags to version information in admin panel
cez81 Feb 27, 2017
a0cb2c0
Added new variable for use on admin page.
cez81 Feb 27, 2017
9a928c3
Fixed incorrect indentation
cez81 Feb 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
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
14 changes: 13 additions & 1 deletion main.go
View file
Open in desktop
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,11 @@ func main() {
}

}

func formatBuiltWith(Tags string) string {
if len(Tags) == 0 {
return ""
}

return " built with: " + strings.Replace(Tags, " ", ", ", -1)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strings.Join

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tags is sqlite bindata form. Why use strings.Join ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, but maybe it's even easier to create a comma separated list to split by space and join by comma