feat(changelog.md): merge changelog from repo and childRepo (#61)

Signed-off-by: Lukasz Dziedziak <[email protected]> Signed-off-by: Charly Molter <[email protected]> Co-authored-by: Charly Molter <[email protected]>
kumahq · Jan 14, 2025 · efcfd6b · efcfd6b
1 parent 00cd1cc
commit efcfd6b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/cmd/release-tool/changelog.go b/cmd/release-tool/changelog.go
@@ -46,13 +46,27 @@ var autoChangelog = &cobra.Command{
 			}
 			return res[i].PublishedAt.After(res[j].PublishedAt)
 		})
+		childReleases := map[string]github.GQLRelease{}
+		if config.childRepo != "" {
+			childResources, err := gqlClient.ReleaseGraphQL(config.childRepo)
+			if err != nil {
+				return err
+			}
+			for _, release := range childResources {
+				childReleases[release.Name] = release
+			}
+		}
 		_, _ = cmd.OutOrStdout().Write([]byte("# Changelog\n<!-- Autogenerated with (github.com/kumahq/ci-tools) release-tool changelog.md -->\n"))
 		for _, release := range res {
 			if !release.IsReleased() { // If the release is not an actual release don't add in changelog.md
 				continue
 			}
 			if strings.Contains(release.Description, "## Changelog") {
 				changelog := strings.SplitN(release.Description, "## Changelog", 2)[1]
+				if childRelease, found := childReleases[release.Name]; found && childRelease.IsReleased() && strings.Contains(release.Description, "## Changelog") {
+					changelog += fmt.Sprintf("\n### Includes [%s@%s](https://github.com/%s/releases/tag/%s) changelog", config.childRepo, childRelease.Name, config.childRepo, childRelease.Name)
+					changelog += strings.SplitN(childRelease.Description, "## Changelog", 2)[1]
+				}
 				_, _ = cmd.OutOrStdout().Write([]byte(fmt.Sprintf(`
 ## %s
 > Released on %s%s
@@ -147,4 +161,5 @@ func init() {
 	versionChangelog.Flags().StringVar(&config.format, "format", string(FormatMarkdown), fmt.Sprintf("The output format (%s, %s)", FormatJson, FormatMarkdown))
 	versionChangelog.Flags().StringVar(&config.repo, "repo", "kumahq/kuma", "The repository to query")
 	autoChangelog.Flags().StringVar(&config.repo, "repo", "kumahq/kuma", "The repository to query")
+	autoChangelog.Flags().StringVar(&config.childRepo, "childRepo", "", "The child repository to query")
 }
diff --git a/cmd/release-tool/main.go b/cmd/release-tool/main.go
@@ -25,11 +25,12 @@ func main() {
 var config Config
 
 type Config struct {
-	branch  string
-	repo    string
-	fromTag string
-	format  string
-	release string
+	branch    string
+	repo      string
+	childRepo string
+	fromTag   string
+	format    string
+	release   string
 }
 
 var rootCmd = &cobra.Command{

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kumahq/ci-tools
 
-go 1.22
+go 1.23.4
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.1