Commitf66d044

authored

chore(scripts): fix stable release promote script (#13204)

1 parent0998ced commitf66d044Copy full SHA for f66d044

File tree

+34

-16

lines changed

+34

-16

lines changed

Lines changed: 14 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,18 +134,22 @@ requiredenvs() {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`gh_auth() {`
`137`		`-local fail=0`
`138`		`-if [["${CODER:-}"=="true" ]];then`
`139`		`-if! output=$(coder external-auth access-token github2>&1);then`
`140`		`-log"ERROR: Could not authenticate with GitHub."`
`141`		`-log"$output"`
`142`		`-fail=1`
	`137`	`+if [[-z${GITHUB_TOKEN:-} ]];then`
	`138`	`+if [[-n${GH_TOKEN:-} ]];then`
	`139`	`+export GITHUB_TOKEN=${GH_TOKEN}`
	`140`	`+elif [[${CODER:-}==true ]];then`
	`141`	`+if! output=$(coder external-auth access-token github2>&1);then`
	`142`	+# TODO(mafredri): We could allow checking `gh auth token` here.
	`143`	`+log"${output}"`
	`144`	`+error"Could not authenticate with GitHub using Coder external auth."`
	`145`	`+else`
	`146`	`+export GITHUB_TOKEN=${output}`
	`147`	`+fi`
	`148`	`+elif token="$(gh auth token --hostname github.com2>/dev/null)";then`
	`149`	`+export GITHUB_TOKEN=${token}`
`143`	`150`	`else`
`144`		`-GITHUB_TOKEN=$(coder external-auth access-token github)`
`145`		`-export GITHUB_TOKEN`
	`151`	`+error"GitHub authentication is required to run this command, please set GITHUB_TOKEN or run 'gh auth login'."`
`146`	`152`	`fi`
`147`		`-else`
`148`		`-log"Please authenticate gh CLI by running 'gh auth login'"`
`149`	`153`	`fi`
`150`	`154`	`}`
`151`	`155`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ func main() {`
`62`	`62`	`Value:serpent.BoolOf(&r.debug),`
`63`	`63`	`},`
`64`	`64`	`{`
`65`		`-Flag:"gh-token",`
	`65`	`+Flag:"github-token",`
`66`	`66`	`Description:"GitHub personal access token.",`
`67`		`-Env:"GH_TOKEN",`
	`67`	`+Env:"GITHUB_TOKEN",`
`68`	`68`	`Value:serpent.StringOf(&r.ghToken),`
`69`	`69`	`},`
`70`	`70`	`{`
`@@ -245,7 +245,7 @@ func (r releaseCommand) promoteVersionToStable(ctx context.Context, inv serpen`
`245`	`245`	`updatedNewStable.Prerelease=github.Bool(false)`
`246`	`246`	`updatedNewStable.Draft=github.Bool(false)`
`247`	`247`	`if!r.dryRun {`
`248`		`-_,_,err=client.Repositories.EditRelease(ctx,owner,repo,newStable.GetID(),newStable)`
	`248`	`+_,_,err=client.Repositories.EditRelease(ctx,owner,repo,newStable.GetID(),updatedNewStable)`
`249`	`249`	`iferr!=nil {`
`250`	`250`	`returnxerrors.Errorf("edit release failed: %w",err)`
`251`	`251`	`}`
`@@ -268,6 +268,10 @@ func cloneRelease(r github.RepositoryRelease) github.RepositoryRelease {`
`268`	`268`	`//`
`269`	`269`	`//> ## Stable (since April 23, 2024)`
`270`	`270`	`funcaddStableSince(date time.Time,bodystring)string {`
	`271`	`+// Protect against adding twice.`
	`272`	`+ifstrings.Contains(body,"> ## Stable (since") {`
	`273`	`+returnbody`
	`274`	`+}`
`271`	`275`	`returnfmt.Sprintf("> ## Stable (since %s)\n\n",date.Format("January 02, 2006"))+body`
`272`	`276`	`}`
`273`	`277`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,19 @@ func Test_addStableSince(t *testing.T) {`
`131`	`131`	`date:=time.Date(2024,time.April,23,0,0,0,0,time.UTC)`
`132`	`132`	`body:="## Changelog"`
`133`	`133`
`134`		`-expected:="> ## Stable (since April 23, 2024)\n\n## Changelog"`
`135`		`-result:=addStableSince(date,body)`
	`134`	`+want:="> ## Stable (since April 23, 2024)\n\n## Changelog"`
	`135`	`+got:=addStableSince(date,body)`
`136`	`136`
`137`		`-ifdiff:=cmp.Diff(expected,result);diff!="" {`
	`137`	`+ifdiff:=cmp.Diff(want,got);diff!="" {`
`138`	`138`	`require.Fail(t,"addStableSince() mismatch (-want +got):\n%s",diff)`
`139`	`139`	`}`
	`140`	`+`
	`141`	`+// Test that it doesn't add twice.`
	`142`	`+got=addStableSince(date,got)`
	`143`	`+`
	`144`	`+ifdiff:=cmp.Diff(want,got);diff!="" {`
	`145`	`+require.Fail(t,"addStableSince() mismatch (-want +got):\n%s",diff,"addStableSince() should not add twice")`
	`146`	`+}`
`140`	`147`	`}`
`141`	`148`
`142`	`149`	`funcTest_release_autoversion(t*testing.T) {`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@ set -euo pipefail`
`4`	`4`	`# shellcheck source=scripts/lib.sh`
`5`	`5`	`source"$(dirname"${BASH_SOURCE[0]}")/lib.sh"`
`6`	`6`
	`7`	`+# Make sure GITHUB_TOKEN is set for the release command.`
	`8`	`+gh_auth`
	`9`	`+`
`7`	`10`	`# This script is a convenience wrapper around the release promote command.`
`8`	`11`	`#`
`9`	`12`	`# Sed hack to make help text look like this script.`

Comments

(0)