From 6d2e027eb728c8294fdd7c3692e9853b3ca2603b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 21 Feb 2019 20:34:08 +0100 Subject: Merging upstream version 1.12.1. Signed-off-by: Daniel Baumann --- .travis/create_artifacts.sh | 2 +- .travis/generate_changelog.sh | 2 +- .travis/nightlies.sh | 2 +- .travis/releaser.sh | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to '.travis') diff --git a/.travis/create_artifacts.sh b/.travis/create_artifacts.sh index ca0724e19..fe75f0f70 100755 --- a/.travis/create_artifacts.sh +++ b/.travis/create_artifacts.sh @@ -27,10 +27,10 @@ echo "--- Create self-extractor ---" # Needed fo GCS echo "--- Copy artifacts to separate directory ---" #shellcheck disable=SC2164 +cp packaging/version artifacts/latest-version.txt cd artifacts ln -s "${BASENAME}.tar.gz" netdata-latest.tar.gz ln -s "${BASENAME}.gz.run" netdata-latest.gz.run sha256sum -b ./* >"sha256sums.txt" echo "checksums:" cat sha256sums.txt - diff --git a/.travis/generate_changelog.sh b/.travis/generate_changelog.sh index d1b72e071..4ae69f1c7 100755 --- a/.travis/generate_changelog.sh +++ b/.travis/generate_changelog.sh @@ -9,7 +9,7 @@ fi ORGANIZATION=$(echo "$TRAVIS_REPO_SLUG" | awk -F '/' '{print $1}') PROJECT=$(echo "$TRAVIS_REPO_SLUG" | awk -F '/' '{print $2}') -GIT_MAIL=${GIT_MAIL:-"pawel+bot@netdata.cloud"} +GIT_MAIL=${GIT_MAIL:-"bot@netdata.cloud"} GIT_USER=${GIT_USER:-"netdatabot"} if [ -z ${GIT_TAG+x} ]; then diff --git a/.travis/nightlies.sh b/.travis/nightlies.sh index fd133d08a..8e867416e 100755 --- a/.travis/nightlies.sh +++ b/.travis/nightlies.sh @@ -7,7 +7,7 @@ if [ ! -f .gitignore ]; then exit 1 fi -export GIT_MAIL="pawel+bot@netdata.cloud" +export GIT_MAIL="bot@netdata.cloud" export GIT_USER="netdatabot" echo "--- Initialize git configuration ---" git config user.email "${GIT_MAIL}" diff --git a/.travis/releaser.sh b/.travis/releaser.sh index 870dec52c..c40f4c1bc 100755 --- a/.travis/releaser.sh +++ b/.travis/releaser.sh @@ -29,7 +29,7 @@ if [ ! -f .gitignore ]; then exit 1 fi -export GIT_MAIL="pawel+bot@netdata.cloud" +export GIT_MAIL="bot@netdata.cloud" export GIT_USER="netdatabot" echo "--- Initialize git configuration ---" git config user.email "${GIT_MAIL}" @@ -87,8 +87,10 @@ if [ "${GIT_TAG}" != "$(git tag --points-at)" ]; then echo "ERROR! Current commit is not tagged. Stopping release creation." exit 1 fi -hub release create --draft \ +until hub release create --draft \ -a "artifacts/netdata-${GIT_TAG}.tar.gz" \ -a "artifacts/netdata-${GIT_TAG}.gz.run" \ -a "artifacts/sha256sums.txt" \ - -m "${GIT_TAG}" "${GIT_TAG}" + -m "${GIT_TAG}" "${GIT_TAG}"; do + sleep 5 +done -- cgit v1.2.3