Merge pull request #11024 from cli/kw/cli-10242-fix-updater-notifications

BagToad · web-flow · commit 98b844a385b6 · 2025-05-27T14:33:43.000-06:00
Fix brew update notifications
diff --git a/internal/ghcmd/cmd.go b/internal/ghcmd/cmd.go
@@ -29,14 +29,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// updaterEnabled is a statically linked build property set in gh formula within homebrew/homebrew-core
-// used to control whether users are notified of newer GitHub CLI releases.
-// This needs to be set to 'cli/cli' as it affects where update.CheckForUpdate() checks for releases.
-// It is unclear whether this means that only homebrew builds will check for updates or not.
-// Development builds leave this empty as impossible to determine if newer or not.
-// For more information, <https://github.com/Homebrew/homebrew-core/blob/master/Formula/g/gh.rb>.
-var updaterEnabled = ""
-
 type exitCode int
 
 const (
diff --git a/internal/ghcmd/update_disabled.go b/internal/ghcmd/update_disabled.go
@@ -0,0 +1,6 @@
+//go:build !updateable
+
+package ghcmd
+
+// See update_enabled.go comment for more information.
+var updaterEnabled = ""
diff --git a/internal/ghcmd/update_enabled.go b/internal/ghcmd/update_enabled.go
@@ -0,0 +1,18 @@
+//go:build updateable
+
+package ghcmd
+
+// `updateable` is a build tag set in the gh formula within homebrew/homebrew-core
+// and is used to control whether users are notified of newer GitHub CLI releases.
+//
+// Currently, updaterEnabled needs to be set to 'cli/cli' as it affects where
+// update.CheckForUpdate() checks for releases. It is unclear to what extent
+// this updaterEnabled is being used by unofficial forks or builds, so we decided
+// to leave it available for injection as a string variable for now.
+//
+// Development builds do not generate update messages by default.
+//
+// For more information, see:
+// - the Homebrew formula for gh: <https://github.com/Homebrew/homebrew-core/blob/master/Formula/g/gh.rb>.
+// - a discussion about adding this build tag: <https://github.com/cli/cli/pull/11024#discussion_r2107597618>.
+var updaterEnabled = "cli/cli"
diff --git a/script/build.go b/script/build.go
@@ -53,7 +53,15 @@ var tasks = map[string]func(string) error{
 			ldflags = fmt.Sprintf("-X github.com/cli/cli/v2/internal/authflow.oauthClientID=%s %s", os.Getenv("GH_OAUTH_CLIENT_ID"), ldflags)
 		}
 
-		return run("go", "build", "-trimpath", "-ldflags", ldflags, "-o", exe, "./cmd/gh")
+		buildTags, _ := os.LookupEnv("GO_BUILDTAGS")
+
+		args := []string{"go", "build", "-trimpath"}
+		if buildTags != "" {
+			args = append(args, "-tags", buildTags)
+		}
+		args = append(args, "-ldflags", ldflags, "-o", exe, "./cmd/gh")
+
+		return run(args...)
 	},
 	"manpages": func(_ string) error {
 		return run("go", "run", "./cmd/gen-docs", "--man-page", "--doc-path", "./share/man/man1/")
