From 8a7b72f7cd1ccd547a03eb4243294e741d661d3f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 8 Feb 2019 08:30:37 +0100
Subject: Adding upstream version 1.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .travis/generate_changelog.sh | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to '.travis/generate_changelog.sh')

diff --git a/.travis/generate_changelog.sh b/.travis/generate_changelog.sh
index d9b91113a..d1b72e071 100755
--- a/.travis/generate_changelog.sh
+++ b/.travis/generate_changelog.sh
@@ -2,10 +2,9 @@
 
 set -e
 
-if [ ! -f .gitignore ]
-then
-  echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
-  exit 1
+if [ ! -f .gitignore ]; then
+	echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
+	exit 1
 fi
 
 ORGANIZATION=$(echo "$TRAVIS_REPO_SLUG" | awk -F '/' '{print $1}')
@@ -13,24 +12,22 @@ PROJECT=$(echo "$TRAVIS_REPO_SLUG" | awk -F '/' '{print $2}')
 GIT_MAIL=${GIT_MAIL:-"pawel+bot@netdata.cloud"}
 GIT_USER=${GIT_USER:-"netdatabot"}
 
-echo "--- Initialize git configuration ---"
-git config user.email "${GIT_MAIL}"
-git config user.name "${GIT_USER}"
+if [ -z ${GIT_TAG+x} ]; then
+	OPTS=""
+else
+	OPTS="--future-release ${GIT_TAG}"
+fi
 
 echo "--- Creating changelog ---"
 git checkout master
 git pull
 #docker run -it --rm -v "$(pwd)":/usr/local/src/your-app ferrarimarco/github-changelog-generator:1.14.3 \
 docker run -it -v "$(pwd)":/project markmandel/github-changelog-generator:latest \
-                                                        --user "${ORGANIZATION}" \
-                                                        --project "${PROJECT}" \
-                                                        --token "${GITHUB_TOKEN}" \
-                                                        --since-tag "v1.10.0" \
-                                                        --unreleased-label "**Next release**" \
-                                                        --no-compare-link \
-                                                        --exclude-labels duplicate,question,invalid,wontfix,discussion,documentation
+	--user "${ORGANIZATION}" \
+	--project "${PROJECT}" \
+	--token "${GITHUB_TOKEN}" \
+	--since-tag "v1.10.0" \
+	--unreleased-label "**Next release**" \
+	--exclude-labels "stale,duplicate,question,invalid,wontfix,discussion,no changelog" \
+	--no-compare-link ${OPTS}
 
-echo "--- Uploading changelog ---"
-git add CHANGELOG.md
-git commit -m '[ci skip] Automatic changelog update' || exit 0
-git push "https://${GITHUB_TOKEN}:@$(git config --get remote.origin.url | sed -e 's/^https:\/\///')"
-- 
cgit v1.2.3