Skip to content
Snippets Groups Projects
Unverified Commit d6c6a380 authored by Tomasz Maczukin's avatar Tomasz Maczukin Committed by Tomasz Maczukin
Browse files

Merge branch 'fix/restore-version-info-in-help-message' into 'master'

parent 3a4fcd46
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/gitlab-runner-helper/main.go
+ 1
− 0
View file @ d6c6a380
...@@ -43,6 +43,7 @@ func main() { ...@@ -43,6 +43,7 @@ func main() {
app := cli.NewApp() app := cli.NewApp()
app.Name = path.Base(os.Args[0]) app.Name = path.Base(os.Args[0])
app.Usage = "a GitLab Runner Helper" app.Usage = "a GitLab Runner Helper"
app.Version = common.VersionShortLine()
cli.VersionPrinter = common.VersionPrinter cli.VersionPrinter = common.VersionPrinter
app.Authors = []cli.Author{ app.Authors = []cli.Author{
cli.Author{ cli.Author{
......
common/version.go
+ 4
− 0
View file @ d6c6a380
...@@ -22,6 +22,10 @@ func VersionLine() string { ...@@ -22,6 +22,10 @@ func VersionLine() string {
return fmt.Sprintf("%s %s (%s)", NAME, VERSION, REVISION) return fmt.Sprintf("%s %s (%s)", NAME, VERSION, REVISION)
} }
func VersionShortLine() string {
return fmt.Sprintf("%s (%s)", VERSION, REVISION)
}
func ExtendedVersion() string { func ExtendedVersion() string {
built := time.Now() built := time.Now()
if BUILT != "now" { if BUILT != "now" {
......
main.go
+ 1
− 0
View file @ d6c6a380
...@@ -56,6 +56,7 @@ func main() { ...@@ -56,6 +56,7 @@ func main() {
app := cli.NewApp() app := cli.NewApp()
app.Name = path.Base(os.Args[0]) app.Name = path.Base(os.Args[0])
app.Usage = "a GitLab Runner" app.Usage = "a GitLab Runner"
app.Version = common.VersionShortLine()
cli.VersionPrinter = common.VersionPrinter cli.VersionPrinter = common.VersionPrinter
app.Authors = []cli.Author{ app.Authors = []cli.Author{
cli.Author{ cli.Author{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment