Skip to content

Commit b126258

Browse files
committed
Fix notes.go so that it still complies with forbidigo
Signed-off-by: peppi-lotta <[email protected]>
1 parent c8a6082 commit b126258

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

hack/tools/release/notes.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package main
2222
import (
2323
"context"
2424
"flag"
25-
"fmt"
25+
fmt2 "fmt"
2626
"log"
2727
"os"
2828
"os/exec"
@@ -213,7 +213,7 @@ func run() int {
213213
}
214214
body = "- " + body
215215

216-
_, err := fmt.Sscanf(c.merge, "Merge pull request %s from %s", &prNumber, &fork)
216+
_, err := fmt2.Sscanf(c.merge, "Merge pull request %s from %s", &prNumber, &fork)
217217
if err != nil {
218218
log.Fatalf("Error parsing merge commit message: %v", err)
219219
}
@@ -226,43 +226,43 @@ func run() int {
226226
merges[superseded] = append(merges[superseded], "- `<insert superseded bumps and reverts here>`")
227227
}
228228

229-
log.Println("<!-- markdownlint-disable no-inline-html line-length -->")
229+
fmt2.Println("<!-- markdownlint-disable no-inline-html line-length -->")
230230
// TODO Turn this into a link (requires knowing the project name + organization)
231-
log.Printf("# Changes since %v\n\n", lastTag)
231+
fmt2.Printf("# Changes since %v\n\n", lastTag)
232232

233233
// print the changes by category
234234
for _, key := range outputOrder {
235235
mergeslice := merges[key]
236236
if len(mergeslice) > 0 {
237-
log.Printf("## %v\n\n", key)
237+
fmt2.Printf("## %v\n\n", key)
238238
for _, merge := range mergeslice {
239-
log.Println(merge)
239+
fmt2.Println(merge)
240240
}
241-
log.Println()
241+
fmt2.Println()
242242
}
243243

244244
// if we're doing beta/rc, print breaking changes and hide the rest of the changes
245245
if key == warning {
246246
if isBeta(latestTag) {
247-
log.Printf(warningTemplate, "BETA RELEASE")
247+
fmt2.Printf(warningTemplate, "BETA RELEASE")
248248
}
249249
if isRC(latestTag) {
250-
log.Printf(warningTemplate, "RELEASE CANDIDATE")
250+
fmt2.Printf(warningTemplate, "RELEASE CANDIDATE")
251251
}
252252
if isBeta(latestTag) || isRC(latestTag) {
253-
log.Printf("<details>\n")
254-
log.Printf("<summary>More details about the release</summary>\n\n")
253+
fmt2.Printf("<details>\n")
254+
fmt2.Printf("<summary>More details about the release</summary>\n\n")
255255
}
256256
}
257257
}
258258

259259
// then close the details if we had it open
260260
if isBeta(latestTag) || isRC(latestTag) {
261-
log.Printf("</details>\n\n")
261+
fmt2.Printf("</details>\n\n")
262262
}
263263

264-
log.Printf("The container image for this release is: %v\n", latestTag)
265-
log.Println("\n_Thanks to all our contributors!_ 😊")
264+
fmt2.Printf("The container image for this release is: %v\n", latestTag)
265+
fmt2.Println("\n_Thanks to all our contributors!_ 😊")
266266

267267
return 0
268268
}
@@ -276,7 +276,7 @@ func formatMerge(line, prNumber string) string {
276276
if prNumber == "" {
277277
return line
278278
}
279-
return fmt.Sprintf("%s (%s)", line, prNumber)
279+
return fmt2.Sprintf("%s (%s)", line, prNumber)
280280
}
281281

282282
// getCommitHashFromNewTag returns the latest commit hash for the specified tag.

0 commit comments

Comments
 (0)