From 842b55b6ba9fffaaf7bde9170e3043fc2b485edf Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Mon, 9 Jan 2023 16:30:22 -0500
Subject: [PATCH] chore: Verbose release notes (#11144)

* chore: verbose release notes

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* fix duplication

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* typo

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* fix duplication

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* updates from comments

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* exclude bot commits

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 hack/generate-release-notes.sh | 36 +++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/hack/generate-release-notes.sh b/hack/generate-release-notes.sh
index cc0d4829cc..279c4c191c 100755
--- a/hack/generate-release-notes.sh
+++ b/hack/generate-release-notes.sh
@@ -56,7 +56,7 @@ kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/$v
 
 ## Release signatures
 
-All Argo CD container images and CLI binaries are signed by cosign. See the [documentation](https://argo-cd.readthedocs.io/en/stable/operator-manual/signed-release-assets.md/) on how to verify the signatures.
+All Argo CD container images and CLI binaries are signed by cosign. See the [documentation](https://argo-cd.readthedocs.io/en/stable/operator-manual/signed-release-assets/) on how to verify the signatures.
 \`\`\`shell
 -----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEesHEB7vX5Y2RxXypjMy1nI1z7iRG
@@ -76,12 +76,18 @@ more_log=$(git log --pretty="format:%s %ae" "$new_ref..$old_ref")
 
 new_commits=$(diff --new-line-format="" --unchanged-line-format="" <(echo "$less_log") <(echo "$more_log") | grep -v "Merge pull request from GHSA")
 new_commits_no_email=$(echo "$new_commits" | strip_last_word)
+features=$(echo "$new_commits_no_email" | grep '^feat' | to_list_items)
+fixes=$(echo "$new_commits_no_email" | grep '^fix' | to_list_items)
+docs=$(echo "$new_commits_no_email" | grep '^docs' | to_list_items)
+other=$(echo "$new_commits_no_email" | grep -v -e '^feat' -e '^fix' -e '^docs' -e '^\[Bot\]' | to_list_items)
 
 contributors_num=$(echo "$new_commits" | only_last_word | sort -u | nonempty_line_count)
 
 new_commits_num=$(echo "$new_commits" | nonempty_line_count)
-features_num=$(echo "$new_commits_no_email" | grep '^feat' | nonempty_line_count)
-fixes_num=$(echo "$new_commits_no_email" | grep '^fix' | nonempty_line_count)
+features_num=$(echo "$features" | nonempty_line_count)
+fixes_num=$(echo "$fixes" | nonempty_line_count)
+docs_num=$(echo "$docs" | nonempty_line_count)
+other_num=$(echo "$other" | nonempty_line_count)
 
 previous_contributors=$(git log --pretty="format:%an %ae" "$old_ref" | sort -uf)
 all_contributors=$(git log --pretty="format:%an %ae" "$new_ref" | sort -uf)
@@ -103,3 +109,27 @@ if [ "$new_contributors_num" -lt 20 ] && [ "$new_contributors_num" -gt 0 ]; then
   echo "$new_contributors_names"
   echo
 fi
+if [ "$features_num" -gt 0 ]; then
+  echo "### Features ($features_num)"
+  echo
+  echo "$features"
+  echo
+fi
+if [ "$fixes_num" -gt 0 ]; then
+  echo "### Bug fixes ($fixes_num)"
+  echo
+  echo "$fixes"
+  echo
+fi
+if [ "$docs_num" -gt 0 ]; then
+  echo "### Documentation ($docs_num)"
+  echo
+  echo "$docs"
+  echo
+fi
+if [ "$other_num" -gt 0 ]; then
+  echo "### Other ($other_num)"
+  echo
+  echo "$other"
+  echo
+fi