From 50d3a6f84ed0659d5c7004283b5e745e6a0b956d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Krupa?= <pawel@krupa.net.pl>
Date: Tue, 22 Jan 2019 13:39:22 +0100
Subject: go through whole nightly before quiting (#5219)

---
 .travis/nightlies.sh | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

(limited to '.travis')

diff --git a/.travis/nightlies.sh b/.travis/nightlies.sh
index 88239793a6..fd133d08ab 100755
--- a/.travis/nightlies.sh
+++ b/.travis/nightlies.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+BAD_THING_HAPPENED=0
 
 if [ ! -f .gitignore ]; then
 	echo "Run as ./travis/$(basename "$0") from top level directory of git repository"
@@ -21,19 +21,25 @@ if [ "$NO_COMMITS" == "$(rev <packaging/version | cut -d- -f 2 | rev)" ]; then
 	exit 0
 fi
 echo "$LAST_TAG-$((NO_COMMITS + 1))-nightly" >packaging/version
-git add packaging/version
-
-echo "---- GENERATE CHANGELOG -----"
-.travis/generate_changelog.sh
-git add CHANGELOG.md
-
-echo "---- UPLOAD FILE CHANGES ----"
-git commit -m '[ci skip] create nightly packages and update changelog'
-git push "https://${GITHUB_TOKEN}:@$(git config --get remote.origin.url | sed -e 's/^https:\/\///')"
+git add packaging/version || exit 1
+
+echo "--- GENERATE CHANGELOG ---"
+if .travis/generate_changelog.sh; then
+	git add CHANGELOG.md
+
+	echo "--- UPLOAD FILE CHANGES ---"
+	git commit -m '[ci skip] create nightly packages and update changelog'
+	git push "https://${GITHUB_TOKEN}:@$(git config --get remote.origin.url | sed -e 's/^https:\/\///')"
+else
+	git clean -xfd
+	BAD_THING_HAPPENED=1
+fi
 
-echo "---- BUILD & PUBLISH DOCKER IMAGES ----"
+echo "--- BUILD & PUBLISH DOCKER IMAGES ---"
 export REPOSITORY="netdata/netdata"
-packaging/docker/build.sh
+packaging/docker/build.sh || BAD_THING_HAPPENED=1
+
+echo "--- BUILD ARTIFACTS ---"
+.travis/create_artifacts.sh || BAD_THING_HAPPENED=1
 
-echo "---- BUILD ARTIFACTS ----"
-.travis/create_artifacts.sh
+exit "${BAD_THING_HAPPENED}"
-- 
cgit v1.2.3