Commit 4e9dc40c authored by Tomasz Maczukin's avatar Tomasz Maczukin
Browse files

Merge branch 'fix-versions-macos' into 'master'

Fix build on macOS

See merge request !8
parents 49935b2e 57a6df37
Pipeline #254201506 passed with stages
in 3 minutes and 26 seconds
......@@ -19,10 +19,10 @@ gitlabChangelog = .tmp/gitlab-changelog-$(GITLAB_CHANGELOG_VERSION)
PKG := $(shell go list .)
PKGs := $(shell go list ./... | grep -vE "^/vendor/")
GO_LDFLAGS := -X $(PKG).VERSION=$(VERSION) \
-X $(PKG).REVISION=$(REVISION) \
-X $(PKG).BRANCH=$(BRANCH) \
-X $(PKG).BUILT=$(BUILT) \
GO_LDFLAGS := -X main.VERSION=$(VERSION) \
-X main.REVISION=$(REVISION) \
-X main.BRANCH=$(BRANCH) \
-X main.BUILT=$(BUILT) \
-s -w
.PHONY: compile
......
......@@ -6,8 +6,6 @@ import (
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"gitlab.com/gitlab-org/ci-cd/runner-tools/tlsctl/version"
)
func main() {
......@@ -15,10 +13,11 @@ func main() {
app.Name = "tlsctl"
app.Usage = "Set of commands to debug TLS certificates for GitLab Runner."
app.Description = "Set of commands to debug TLS certificates for GitLab Runner."
app.Version = version.Version().ShortLine()
app.Version = Version().ShortLine()
app.Author = "GitLab Inc. <support@gitlab.com>"
cli.VersionPrinter = func(_ *cli.Context) {
fmt.Print(version.Version().Extended())
fmt.Print(Version().Extended())
}
app.Commands = []cli.Command{
......
package version
package main
import (
"fmt"
......@@ -12,9 +12,6 @@ var (
REVISION = "HEAD"
BRANCH = "HEAD"
BUILT = "now"
AuthorName = "GitLab Inc."
AuthorEmail = "support@gitlab.com"
)
type VersionInfo struct {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment