chore(scripts): fix stable release promote script

mafredri · mafredri · commit 40651dd6b359 · 2024-05-07T22:02:25.000+03:00
diff --git a/scripts/release/main.go b/scripts/release/main.go
@@ -62,9 +62,9 @@ func main() {
 				Value:       serpent.BoolOf(&r.debug),
 			},
 			{
-				Flag:        "gh-token",
+				Flag:        "github-token",
 				Description: "GitHub personal access token.",
-				Env:         "GH_TOKEN",
+				Env:         "GITHUB_TOKEN",
 				Value:       serpent.StringOf(&r.ghToken),
 			},
 			{
@@ -245,7 +245,7 @@ func (r *releaseCommand) promoteVersionToStable(ctx context.Context, inv *serpen
 	updatedNewStable.Prerelease = github.Bool(false)
 	updatedNewStable.Draft = github.Bool(false)
 	if !r.dryRun {
-		_, _, err = client.Repositories.EditRelease(ctx, owner, repo, newStable.GetID(), newStable)
+		_, _, err = client.Repositories.EditRelease(ctx, owner, repo, newStable.GetID(), updatedNewStable)
 		if err != nil {
 			return xerrors.Errorf("edit release failed: %w", err)
 		}
@@ -268,6 +268,10 @@ func cloneRelease(r *github.RepositoryRelease) *github.RepositoryRelease {
 //
 //	> ## Stable (since April 23, 2024)
 func addStableSince(date time.Time, body string) string {
+	// Protect against adding twice.
+	if strings.Contains(body, "> ## Stable (since") {
+		return body
+	}
 	return fmt.Sprintf("> ## Stable (since %s)\n\n", date.Format("January 02, 2006")) + body
 }
 
diff --git a/scripts/release_promote_stable.sh b/scripts/release_promote_stable.sh
@@ -4,6 +4,9 @@ set -euo pipefail
 # shellcheck source=scripts/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
 
+# Make sure GITHUB_TOKEN is set for the release command.
+gh_auth
+
 # This script is a convenience wrapper around the release promote command.
 #
 # Sed hack to make help text look like this script.

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.`