Don't use env vars!

probablycorey · probablycorey · commit fb7ea2c6a696 · 2019-12-03T12:16:29.000-08:00
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -22,7 +22,6 @@ jobs:
           version: latest
           args: release
         env:
-          APP_ENV: production
           GH_OAUTH_CLIENT_ID: 178c6fc778ccc68e1d6a
           GH_OAUTH_CLIENT_SECRET: ${{secrets.OAUTH_CLIENT_SECRET}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -9,6 +9,7 @@ builds:
       - -s -w -X github.com/github/gh-cli/command.Version={{.Version}} -X github.com/github/gh-cli/command.BuildDate={{.Date}}
       - -X github.com/github/gh-cli/context.oauthClientID={{.Env.GH_OAUTH_CLIENT_ID}}
       - -X github.com/github/gh-cli/context.oauthClientSecret={{.Env.GH_OAUTH_CLIENT_SECRET}}
+      - -X github.com/github/gh-cli.updaterEnabled=yes
     goos:
       - linux
       - darwin
diff --git a/main.go b/main.go
@@ -9,6 +9,8 @@ import (
 	"github.com/github/gh-cli/update"
 )
 
+var updaterEnabled = "no"
+
 func main() {
 	updateMessageChan := make(chan *string)
 	go updateInBackground(updateMessageChan)
@@ -29,7 +31,7 @@ func main() {
 }
 
 func updateInBackground(updateMessageChan chan *string) {
-	if os.Getenv("APP_ENV") != "production" {
+	if updaterEnabled != "yes" {
 		updateMessageChan <- nil
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ import (`
`9`	`9`	`"github.com/github/gh-cli/update"`
`10`	`10`	`)`
`11`	`11`
	`12`	`+var updaterEnabled = "no"`
	`13`	`+`
`12`	`14`	`func main() {`
`13`	`15`	`updateMessageChan := make(chan *string)`
`14`	`16`	`go updateInBackground(updateMessageChan)`
`@@ -29,7 +31,7 @@ func main() {`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`func updateInBackground(updateMessageChan chan *string) {`
`32`		`- if os.Getenv("APP_ENV") != "production" {`
	`34`	`+ if updaterEnabled != "yes" {`
`33`	`35`	`updateMessageChan <- nil`
`34`	`36`	`return`
`35`	`37`	`}`