Inject bb info into version command.

buildbuddy-io · Dec 8, 2020 · 321a605 · 321a605
1 parent f6614e0
commit 321a605
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/cmd/buildbuddy/BUILD b/cmd/buildbuddy/BUILD
@@ -6,12 +6,14 @@ go_library(
     importpath = "github.com/buildbuddy-io/buildbuddy-cli/cmd/buildbuddy",
     visibility = ["//visibility:private"],
     deps = [
+        "//:go_default_library",
         "//commandline:go_default_library",
         "//logging:go_default_library",
         "//parser:go_default_library",
         "//sidecar:go_default_library",
         "@com_github_bazelbuild_bazelisk//core:go_default_library",
         "@com_github_bazelbuild_bazelisk//repositories:go_default_library",
+        "@com_github_buildbuddy_io_buildbuddy//server/version:go_default_library",
     ],
 )
 

diff --git a/cmd/buildbuddy/buildbuddy.go b/cmd/buildbuddy/buildbuddy.go
@@ -14,6 +14,8 @@ import (
 	"github.com/buildbuddy-io/buildbuddy-cli/commandline"
 	"github.com/buildbuddy-io/buildbuddy-cli/parser"
 	"github.com/buildbuddy-io/buildbuddy-cli/sidecar"
+	"github.com/buildbuddy-io/buildbuddy-cli/static_data"
+	"github.com/buildbuddy-io/buildbuddy/server/version"
 
 	bblog "github.com/buildbuddy-io/buildbuddy-cli/logging"
 )
@@ -100,6 +102,11 @@ func main() {
 	remoteCacheFlag := parser.GetRCFlagValue(opts, subcommand, bazelFlags.Config, "--remote_cache")
 	remoteExecFlag := parser.GetRCFlagValue(opts, subcommand, bazelFlags.Config, "--remote_executor")
 
+	if subcommand == "version" {
+		if b, ok := static_data.Data["VERSION"]; ok {
+			fmt.Printf("bb %s\n", version.AppVersion(b))
+		}
+	}
 	if besBackendFlag == "" && remoteCacheFlag == "" {
 		runBazelAndDie(filteredOSArgs)
 	}
@@ -124,9 +131,9 @@ func main() {
 	}
 	if remoteCacheFlag != "" && remoteExecFlag == "" {
 		sidecarArgs = append(sidecarArgs, remoteCacheFlag)
-               // Also specify as disk cache directory.
-               diskCacheDir := filepath.Join(bbHome, "filecache")
-               sidecarArgs = append(sidecarArgs, fmt.Sprintf("--cache_directory=%s", diskCacheDir))
+		// Also specify as disk cache directory.
+		diskCacheDir := filepath.Join(bbHome, "filecache")
+		sidecarArgs = append(sidecarArgs, fmt.Sprintf("--cache_directory=%s", diskCacheDir))
 	}
 
 	if len(sidecarArgs) > 0 {