gitea/tea
gitea/tea
56
129
Fork 64
Code Issues 97 Pull Requests 19 Actions Releases 16 Activity

Show more version info #486

Merged
lunny merged 4 commits from 6543/tea:show-more-version-info into master 2022-06-18 14:34:19 +00:00
Conversation 1 Commits 4 Files Changed 2 +19 -6
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -24,7 +24,8 @@ endif
TEA_VERSION_TAG ?= $(shell sed 's/+/_/' <<< $(TEA_VERSION)) TEA_VERSION_TAG ?= $(shell sed 's/+/_/' <<< $(TEA_VERSION))
TAGS ?= TAGS ?=
LDFLAGS := -X "main.Version=$(TEA_VERSION)" -X "main.Tags=$(TAGS)" -s -w SDK ?= $(shell $(GO) list -f '{{.Version}}' -m code.gitea.io/sdk/gitea)
6543 marked this conversation as resolved Outdated
42wim commented 2022-06-17 14:10:02 +00:00
Outdated
Review
Copy Link

Maybe better use the go tooling ?
go list -f '{{.Version}}' -m code.gitea.io/sdk/gitea

Maybe better use the go tooling ? `go list -f '{{.Version}}' -m code.gitea.io/sdk/gitea`
👍 1
LDFLAGS := -X "main.Version=$(TEA_VERSION)" -X "main.Tags=$(TAGS)" -X "main.SDK=$(SDK)" -s -w
# override to allow passing additional goflags via make CLI # override to allow passing additional goflags via make CLI
override GOFLAGS := $(GOFLAGS) -mod=vendor -tags '$(TAGS)' -ldflags '$(LDFLAGS)' override GOFLAGS := $(GOFLAGS) -mod=vendor -tags '$(TAGS)' -ldflags '$(LDFLAGS)'

22
main.go
View File

@ -8,6 +8,7 @@ package main // import "code.gitea.io/tea"
import ( import (
"fmt" "fmt"
"os" "os"
"runtime"
"strings" "strings"
"code.gitea.io/tea/cmd" "code.gitea.io/tea/cmd"
@ -21,6 +22,9 @@ var Version = "development"
// Tags holds the build tags used // Tags holds the build tags used
var Tags = "" var Tags = ""
// SDK holds the sdk version from go.mod
var SDK = ""
func main() { func main() {
// make parsing tea --version easier, by printing /just/ the version string // make parsing tea --version easier, by printing /just/ the version string
cli.VersionPrinter = func(c *cli.Context) { fmt.Fprintln(c.App.Writer, c.App.Version) } cli.VersionPrinter = func(c *cli.Context) { fmt.Fprintln(c.App.Writer, c.App.Version) }
@ -30,7 +34,7 @@ func main() {
app.Usage = "command line tool to interact with Gitea" app.Usage = "command line tool to interact with Gitea"
app.Description = appDescription app.Description = appDescription
app.CustomAppHelpTemplate = helpTemplate app.CustomAppHelpTemplate = helpTemplate
app.Version = Version + formatBuiltWith(Tags) app.Version = formatVersion()
app.Commands = []*cli.Command{ app.Commands = []*cli.Command{
&cmd.CmdLogin, &cmd.CmdLogin,
&cmd.CmdLogout, &cmd.CmdLogout,
@ -61,12 +65,20 @@ func main() {
} }
} }
func formatBuiltWith(Tags string) string { func formatVersion() string {
if len(Tags) == 0 { version := fmt.Sprintf("Version: %s\tgolang: %s",
return "" bold(Version),
strings.ReplaceAll(runtime.Version(), "go", ""))
if len(Tags) != 0 {
version += fmt.Sprintf("\tbuilt with: %s", strings.Replace(Tags, " ", ", ", -1))
} }
return " built with: " + strings.Replace(Tags, " ", ", ", -1) if len(SDK) != 0 {
version += fmt.Sprintf("\tgo-sdk: %s", SDK)
}
return version
} }
var appDescription = `tea is a productivity helper for Gitea. It can be used to manage most entities on var appDescription = `tea is a productivity helper for Gitea. It can be used to manage most entities on