From 905e5ec07fb62ee081050beb30ae6255033fa5df Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Mon, 26 May 2025 16:27:23 +0200
Subject: [PATCH] build: handle multiple general release notes

---
 relnotes/README.md |  3 +++
 script/relnotes.go | 33 +++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/relnotes/README.md b/relnotes/README.md
index 66a4991c6..99d75634d 100644
--- a/relnotes/README.md
+++ b/relnotes/README.md
@@ -16,3 +16,6 @@ example:
 
 The release notes will also be included in candidate releases (e.g.
 v1.2.3-rc.1).
+
+Additional notes will also be loaded from `v1.2.md` and `v1.md`, if they
+exist.
diff --git a/script/relnotes.go b/script/relnotes.go
index ffc27c22f..b88c2f7fc 100644
--- a/script/relnotes.go
+++ b/script/relnotes.go
@@ -43,29 +43,38 @@ func main() {
 		log.Fatalln("Must set $GITHUB_TOKEN")
 	}
 
-	addl, err := additionalNotes(*ver)
+	notes, err := additionalNotes(*ver)
 	if err != nil {
 		log.Fatalln("Gathering additional notes:", err)
 	}
-	notes, err := generatedNotes(*ver, *branch, *prevVer)
+	gh, err := generatedNotes(*ver, *branch, *prevVer)
 	if err != nil {
 		log.Fatalln("Gathering github notes:", err)
 	}
+	notes = append(notes, gh)
 
-	if addl != "" {
-		fmt.Println(addl)
-	}
-	fmt.Println(notes)
+	fmt.Println(strings.Join(notes, "\n\n"))
 }
 
 // Load potential additional release notes from within the repo
-func additionalNotes(newVer string) (string, error) {
+func additionalNotes(newVer string) ([]string, error) {
+	var notes []string
 	ver, _, _ := strings.Cut(newVer, "-")
-	bs, err := os.ReadFile(fmt.Sprintf("relnotes/%s.md", ver))
-	if os.IsNotExist(err) {
-		return "", nil
+	for {
+		file := fmt.Sprintf("relnotes/%s.md", ver)
+		if bs, err := os.ReadFile(file); err == nil {
+			notes = append(notes, strings.TrimSpace(string(bs)))
+		} else if !os.IsNotExist(err) {
+			return nil, err
+		}
+
+		if idx := strings.LastIndex(ver, "."); idx > 0 {
+			ver = ver[:idx]
+		} else {
+			break
+		}
 	}
-	return string(bs), err
+	return notes, nil
 }
 
 // Load generated release notes (list of pull requests and contributors)
@@ -105,5 +114,5 @@ func generatedNotes(newVer, targetCommit, prevVer string) (string, error) {
 	if err := json.NewDecoder(res.Body).Decode(&resJSON); err != nil {
 		return "", err
 	}
-	return resJSON.Body, nil
+	return strings.TrimSpace(resJSON.Body), nil
 }