Bump version number to 4.2.0 (#4617)

* Bump version number to 4.2.0 * Add support for banner in the changelog from a GitHub issue * Fixes following review feedback
cloudfoundry · Oct 5, 2020 · 49be394 · 49be394
1 parent 03ec621
commit 49be394
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 12 deletions.
diff --git a/build/tools/changelog.sh b/build/tools/changelog.sh
@@ -20,6 +20,17 @@ echo -e "${CYAN}${BOLD}===================================${RESET}"
 echo -e "${YELLOW}Stratos Directory: ${STRATOS_DIR}${RESET}"
 echo ""
 
+STATE="+state:closed"
+while getopts ":a" opt; do
+  case $opt in
+    a)
+    STATE=""
+      ;;
+  esac
+done
+
+shift $((OPTIND-1))
+
 # Get the version number from the package.json file
 
 # This is the base repository
@@ -58,27 +69,43 @@ echo -e "${YELLOW}Previous version : ${BOLD}$CURRENT${RESET}"
 function search() {
   FILTER=$1
   if [ -n "${FORK_QUERY}" ]; then
-    curl -s "https://api.github.com/search/issues?q=${FORK_QUERY}${FILTER}" | jq -r '.items | .[] | "- \(.title) [\\#\(.number)](\(.html_url))"' | tee -a ${CHANGELOG}
+    curl -s "https://api.github.com/search/issues?q=${FORK_QUERY}+-label:release-notes${FILTER}" | jq -r '.items | .[] | "- \(.title) [\\#\(.number)](\(.html_url))"' | tee -a ${CHANGELOG}
   fi
-  curl -s "https://api.github.com/search/issues?q=${QUERY}${FILTER}" | jq -r '.items | .[] | "- \(.title) [\\#\(.number)](\(.html_url))"' | tee -a ${CHANGELOG}
+  curl -s "https://api.github.com/search/issues?q=${QUERY}+-label:release-notes${FILTER}" | jq -r '.items | .[] | "- \(.title) [\\#\(.number)](\(.html_url))"' | tee -a ${CHANGELOG}
 }
 
 function breaking_changes() {
   FILTER=$1
   if [ -n "${FORK_QUERY}" ]; then
-    curl -s "https://api.github.com/search/issues?q=${FORK_QUERY}${FILTER}" | jq -r '.items | .[] | "- **\(.title)**\n\n  \(.body)"' > ${CHANGELOG}.breaking
+    curl -s "https://api.github.com/search/issues?q=${FORK_QUERY}+-label:release-notes${FILTER}" | jq -r '.items | .[] | "- **\(.title)**\n\n  \(.body)"' > ${CHANGELOG}.breaking
+  fi
+  curl -s "https://api.github.com/search/issues?q=${QUERY}+-label:release-notes${FILTER}" | jq -r '.items | .[] | "- **\(.title)**\n\n  \(.body)"' > ${CHANGELOG}.breaking
+}
+
+
+function get_banner() {
+  BANNER="label:release-notes"
+  banner=""
+  if [ -n "${FORK_QUERY}" ]; then
+    banner=$(curl -s "https://api.github.com/search/issues?q=${BANNER}+${FORK_QUERY}" | jq -r '.items | .[] | .body')
+  fi
+  if [ -z "${banner}" ]; then
+    banner=$(curl -s "https://api.github.com/search/issues?q=${BANNER}+${QUERY}" | jq -r '.items | .[] | .body')
+  fi
+
+  if [ -z "${banner}" ]; then
+    banner="This release contains a number of fixes and improvements:"
   fi
-  curl -s "https://api.github.com/search/issues?q=${QUERY}${FILTER}" | jq -r '.items | .[] | "- **\(.title)**\n\n  \(.body)"' > ${CHANGELOG}.breaking
 }
 
 function log() {
-  echo $1 | tee -a ${CHANGELOG}
+  echo "$1" | tee -a ${CHANGELOG}
 }
 
 COMPARE_REPO=${REPO}
-QUERY="repo:${REPO}+milestone:${MILESTONE}+state:closed"
+QUERY="repo:${REPO}+milestone:${MILESTONE}${STATE}"
 if [ -n "${FORK}" ]; then
-  FORK_QUERY="repo:${FORK}+milestone:${MILESTONE}+state:closed"
+  FORK_QUERY="repo:${FORK}+milestone:${MILESTONE}${STATE}"
   COMPARE_REPO=${FORK}
 fi
 
@@ -88,6 +115,7 @@ BREAKING_CHANGES="+label:breaking-change"
 
 mv ${CHANGELOG} CHANGELOG.old
 
+get_banner
 
 echo ""
 echo -e "${CYAN}${BOLD}Generating Change log - content for version ${MILESTONE} will be shown below"
@@ -99,7 +127,7 @@ log "## ${MILESTONE}"
 log ""
 log "[Full Changelog](https://github.com/${COMPARE_REPO}/compare/${CURRENT}...${MILESTONE})"
 log ""
-log "This release contains a number of fixes and improvements:"
+log "$banner"
 log ""
 log "**Improvements:**"
 log ""
@@ -129,6 +157,6 @@ rm -f ${CHANGELOG}.breaking
 log ""
 
 tail -n +2 CHANGELOG.old >> ${CHANGELOG}
-rm CHANGELOG.old 
+rm CHANGELOG.old
 
 sed -i.bak 's/\# Change Log.*\#\# ${CURRENT}//' ${CHANGELOG}
diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
@@ -22,7 +22,7 @@ Check the repository was successfully added by searching for the `console`, for
 ```
 helm search repo console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	4.1.0           4.1.0      	A Helm chart for deploying Stratos UI Console
+stratos/console    	4.2.0           4.2.0      	A Helm chart for deploying Stratos UI Console
 ```
 
 > Note: Version numbers will depend on the version of Stratos available from the Helm repository

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {