From 3b39ca350ce6c7e24394b8185c7dc74e6cf9ae53 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Mon, 21 Aug 2017 14:55:43 +0200 Subject: [PATCH] Exclude greenkeeper merges from changelog There is a great deal of lines about Greenkeeper merges in the changelog, making it hard to find real changes to the code. This commit modifies the changelog task to exclude such lines. --- tasks/changelog.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tasks/changelog.sh b/tasks/changelog.sh index 96ddcfafc5..27603e6000 100755 --- a/tasks/changelog.sh +++ b/tasks/changelog.sh @@ -44,16 +44,18 @@ main() { git log --first-parent --format='%aN|%s %b' ${1} | { while read l; do - if [[ ${l} =~ ${MERGE_RE} ]] ; then - number="${BASH_REMATCH[1]}" - author="${BASH_REMATCH[2]}" - summary="${BASH_REMATCH[3]}" - echo " * [#${number}](${PULLS_URL}/${number}) - ${summary} ([@${author}](${GITHUB_URL}/${author}))" - elif [[ ${l} =~ ${SQUASH_RE} ]] ; then - number="${BASH_REMATCH[3]}" - author="${BASH_REMATCH[1]}" - summary="${BASH_REMATCH[2]}" - echo " * [#${number}](${PULLS_URL}/${number}) - ${summary} ([${author}](${GITHUB_URL}/search?q=${author}&type=Users))" + if ! [[ ${l} =~ "openlayers/greenkeeper" ]] ; then + if [[ ${l} =~ ${MERGE_RE} ]] ; then + number="${BASH_REMATCH[1]}" + author="${BASH_REMATCH[2]}" + summary="${BASH_REMATCH[3]}" + echo " * [#${number}](${PULLS_URL}/${number}) - ${summary} ([@${author}](${GITHUB_URL}/${author}))" + elif [[ ${l} =~ ${SQUASH_RE} ]] ; then + number="${BASH_REMATCH[3]}" + author="${BASH_REMATCH[1]}" + summary="${BASH_REMATCH[2]}" + echo " * [#${number}](${PULLS_URL}/${number}) - ${summary} ([${author}](${GITHUB_URL}/search?q=${author}&type=Users))" + fi fi done }