From 5a734384d325c9c47bdfb1ba8f7c38442fb6f79c Mon Sep 17 00:00:00 2001 From: Colton Morris Date: Wed, 3 Nov 2021 18:11:14 -0600 Subject: [PATCH 1/4] Added version flag --- .plzconfig | 5 ++++- adapters/cobra/root.go | 11 +++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.plzconfig b/.plzconfig index 037d898..ec351d6 100644 --- a/.plzconfig +++ b/.plzconfig @@ -14,4 +14,7 @@ preloadbuilddefs = build_defs/go_mock_rule.build_defs [go] importpath = github.com/tcncloud/wollemi -gotool = //tools/go:toolchain|go \ No newline at end of file +gotool = //tools/go:toolchain|go + +[build] +passenv = CI_COMMIT_TAG diff --git a/adapters/cobra/root.go b/adapters/cobra/root.go index 93aab32..8428aeb 100644 --- a/adapters/cobra/root.go +++ b/adapters/cobra/root.go @@ -2,6 +2,7 @@ package cobra import ( "fmt" + "os" "github.com/spf13/cobra" @@ -15,9 +16,15 @@ func RootCmd(app ctl.Application) *cobra.Command { logFormat string ) + version := os.Getenv("CI_COMMIT_TAG") + if version == "" { + version = "latest" + } + cmd := &cobra.Command{ - Use: "wollemi", - Short: "cli for wollemi", + Use: "wollemi", + Version: version, + Short: "cli for wollemi", Long: Description(` Please build file generator and formatter capable of generating go_binary, go_library and go_test build rules from existing go code. From 70237391cafa5b6aff39951186f2dcd1bff25bfd Mon Sep 17 00:00:00 2001 From: Colton Morris Date: Sat, 22 Jan 2022 11:56:34 -0700 Subject: [PATCH 2/4] linking the version --- BUILD.plz | 5 +++++ adapters/cobra/root.go | 9 ++------- build_defs/BUILD.plz | 7 +++++++ build_defs/VERSION | 1 + ports/wollemi/version.go | 5 +++++ 5 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 build_defs/BUILD.plz create mode 100644 build_defs/VERSION create mode 100644 ports/wollemi/version.go diff --git a/BUILD.plz b/BUILD.plz index 787338d..34cb83b 100644 --- a/BUILD.plz +++ b/BUILD.plz @@ -1,7 +1,12 @@ +subinclude("//build_defs:version") + go_binary( name = "wollemi", srcs = ["main.go"], visibility = ["PUBLIC"], + definitions = { + "github.com/tcncloud/wollemi/ports/wollemi.WollemiVersion": VERSION, + }, deps = [ "//adapters/bazel", "//adapters/cobra", diff --git a/adapters/cobra/root.go b/adapters/cobra/root.go index 8428aeb..34faebf 100644 --- a/adapters/cobra/root.go +++ b/adapters/cobra/root.go @@ -2,12 +2,12 @@ package cobra import ( "fmt" - "os" "github.com/spf13/cobra" "github.com/tcncloud/wollemi/ports/ctl" "github.com/tcncloud/wollemi/ports/logging" + "github.com/tcncloud/wollemi/ports/wollemi" ) func RootCmd(app ctl.Application) *cobra.Command { @@ -16,14 +16,9 @@ func RootCmd(app ctl.Application) *cobra.Command { logFormat string ) - version := os.Getenv("CI_COMMIT_TAG") - if version == "" { - version = "latest" - } - cmd := &cobra.Command{ Use: "wollemi", - Version: version, + Version: wollemi.WollemiVersion, Short: "cli for wollemi", Long: Description(` Please build file generator and formatter capable of generating go_binary, diff --git a/build_defs/BUILD.plz b/build_defs/BUILD.plz new file mode 100644 index 0000000..eb1a093 --- /dev/null +++ b/build_defs/BUILD.plz @@ -0,0 +1,7 @@ +genrule( + name = "version", + srcs = ["VERSION"], + outs = ["version.build_defs"], + cmd = "echo \"VERSION = '`cat $SRCS`'\" > \"$OUT\"", + visibility = ["PUBLIC"], +) diff --git a/build_defs/VERSION b/build_defs/VERSION new file mode 100644 index 0000000..7486fdb --- /dev/null +++ b/build_defs/VERSION @@ -0,0 +1 @@ +0.7.2 diff --git a/ports/wollemi/version.go b/ports/wollemi/version.go new file mode 100644 index 0000000..6c45082 --- /dev/null +++ b/ports/wollemi/version.go @@ -0,0 +1,5 @@ +package wollemi + +// WollemiVersion is the current version of wollemi. +// Note that non-bootstrap builds replace this interim version with a real one. +var WollemiVersion = "dev-0.0.9999" From a441a6da0afa41065e7b0f8fdb4c42057ae5bc18 Mon Sep 17 00:00:00 2001 From: Colton Morris Date: Sat, 22 Jan 2022 11:58:49 -0700 Subject: [PATCH 3/4] remove git commit tag from previous attempt to get versioning working --- .plzconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.plzconfig b/.plzconfig index ec351d6..933b79b 100644 --- a/.plzconfig +++ b/.plzconfig @@ -14,7 +14,3 @@ preloadbuilddefs = build_defs/go_mock_rule.build_defs [go] importpath = github.com/tcncloud/wollemi -gotool = //tools/go:toolchain|go - -[build] -passenv = CI_COMMIT_TAG From 749b477db8c29089d5e2f2c66e94e5ada92daa54 Mon Sep 17 00:00:00 2001 From: Colton Morris Date: Sat, 22 Jan 2022 12:17:58 -0700 Subject: [PATCH 4/4] didnt mean to remove the go toolchain --- .plzconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/.plzconfig b/.plzconfig index 933b79b..b13b9ac 100644 --- a/.plzconfig +++ b/.plzconfig @@ -14,3 +14,4 @@ preloadbuilddefs = build_defs/go_mock_rule.build_defs [go] importpath = github.com/tcncloud/wollemi +gotool = //tools/go:toolchain|go