From 30b3eebabc32ba653defb4a4b4e3bc58624e83e3 Mon Sep 17 00:00:00 2001
From: pacucha42 <38914089+pacucha42@users.noreply.github.com>
Date: Sat, 28 Jul 2018 09:28:04 +0200
Subject: [PATCH] * merge only annotated tag messages into release notes
 (#1683)

---
 tools/deploy.sh | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/tools/deploy.sh b/tools/deploy.sh
index 3b008767599..9ec9458cec7 100644
--- a/tools/deploy.sh
+++ b/tools/deploy.sh
@@ -76,11 +76,11 @@ shopt -u nocasematch
 #
 # Prepare Markdown release notes:
 #################################
-#
-# - tag's description:
-# 	ignore first 3 lines - commiter, tagname, blank
-#	first line of message: heading
-#	other lines: converted to bullets
+# - annotated tags only, lightweight tags just display message of referred commit
+# - tag's description conversion to relnotes:
+# 	first 3 lines (tagname, commiter, blank): ignored
+#	4th line: relnotes heading
+#	remaining lines: each converted to bullet-list item
 #	empty lines ignored
 #	if '* ' found as a first char pair, it's converted to '- ' to keep bulleting unified
 echo
@@ -90,9 +90,10 @@ echo "Tag's message:"
 
 relNotesRaw=`git show -s --format=%b $varTagName`
 readarray -t msgArray <<<"$relNotesRaw"
-
 arrLen=${#msgArray[@]}
-if [ $arrLen > 3 ]; then 
+
+#process annotated tags only
+if [ $arrLen > 3 ] && [ "${msgArray[0]:0:3}" == "tag" ]; then 
 	ind=3
 	while [ $ind -lt $arrLen ]; do
 		if [ $ind -eq 3 ]; then
@@ -113,14 +114,10 @@ if [ $arrLen > 3 ]; then
 		fi
 		let ind=$ind+1
 	done
-else
-	releaseNotes="#### Release of $varTagName"
-	releaseNotes+=$'\r\n'
-	
-	#debug output
-	echo "   Release of $varTagName"
 fi
 
+echo "$releaseNotes"
+
 # - list of commits (commits.txt must exit in the output dir)
 commitFile=$varAssetsDir/commits.txt
 if [ -s "$commitFile" ]; then