Merge pull request #168 from replicatedhq/fix

dexhorthy · web-flow · commit 0e3a0ab4400f · 2020-12-29T10:40:34.000-06:00
fix env var to match default in kots starter
diff --git a/cli/cmd/release_create.go b/cli/cmd/release_create.go
@@ -88,7 +88,7 @@ func (r *runners) gitSHABranch() (sha string, branch string, dirty bool, err err
 	branchName := head.Name().Short()
 
 	// for GH Actions, prefer env branch
-	envBranch := os.Getenv("GITHUB_BRANCH")
+	envBranch := os.Getenv("GITHUB_BRANCH_NAME")
 	if envBranch != "" {
 		branchName = envBranch
 	}

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (r *runners) gitSHABranch() (sha string, branch string, dirty bool, err err`
`88`	`88`	`branchName := head.Name().Short()`
`89`	`89`
`90`	`90`	`// for GH Actions, prefer env branch`
`91`		`- envBranch := os.Getenv("GITHUB_BRANCH")`
	`91`	`+ envBranch := os.Getenv("GITHUB_BRANCH_NAME")`
`92`	`92`	`if envBranch != "" {`
`93`	`93`	`branchName = envBranch`
`94`	`94`	`}`