From b60ff1fa6b146a6ee27217aae04f139ca6878722 Mon Sep 17 00:00:00 2001
From: Juan Fernandez <juan.fernandezdealba@datadoghq.com>
Date: Mon, 27 Apr 2026 16:14:41 +0200
Subject: [PATCH] Use GitHub-generated release notes

---
 RELEASE.md                         |  2 +-
 scripts/release-datadog-ci-bump.sh | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 9ca73bb..1653903 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -34,7 +34,7 @@ The script fetches `main` and tags, finds the latest merged PR with the `datadog
 - `datadog-ci` minor bump: action minor bump
 - `datadog-ci` patch bump: action patch bump
 
-The release creates the next immutable action tag, updates the moving major tag, and creates a GitHub Release.
+The release creates the next immutable action tag, updates the moving major tag, and creates a GitHub Release with GitHub-generated release notes starting from the previous immutable action tag.
 
 Preview the release without creating tags or a GitHub Release:
 
diff --git a/scripts/release-datadog-ci-bump.sh b/scripts/release-datadog-ci-bump.sh
index 6eb434b..721ad47 100755
--- a/scripts/release-datadog-ci-bump.sh
+++ b/scripts/release-datadog-ci-bump.sh
@@ -252,17 +252,6 @@ if gh release view "$next_tag" --repo "$repo" >/dev/null 2>&1; then
   exit 1
 fi
 
-notes_file=$(mktemp)
-trap 'rm -f "$notes_file"' EXIT
-cat > "$notes_file" <<EOF
-Updates the default \`datadog-ci-version\` from \`$latest_datadog_ci_version\` to \`$release_datadog_ci_version\`.
-
-Triggered by $release_source
-EOF
-if [[ -n "$release_pr_merged_at" ]]; then
-  echo "Merged at: $release_pr_merged_at" >> "$notes_file"
-fi
-
 echo "Latest action release tag: $latest_tag"
 echo "Next action release tag: $next_tag"
 echo "Action bump kind: $action_bump_kind"
@@ -286,6 +275,7 @@ git push --force "$remote" "refs/tags/$major_tag"
 
 gh release create "$next_tag" \
   --repo "$repo" \
-  --target "$release_sha" \
   --title "$next_tag" \
-  --notes-file "$notes_file"
+  --verify-tag \
+  --generate-notes \
+  --notes-start-tag "$latest_tag"