diff options
Diffstat (limited to '.travis')
| -rw-r--r-- | .travis/README.md | 2 | ||||
| -rwxr-xr-x | .travis/create_artifacts.sh | 28 | ||||
| -rwxr-xr-x | .travis/draft_release.sh | 4 | ||||
| -rwxr-xr-x | .travis/generate_changelog_and_tag_release.sh | 4 | ||||
| -rwxr-xr-x | .travis/generate_changelog_for_nightlies.sh | 4 |
5 files changed, 22 insertions, 20 deletions
diff --git a/.travis/README.md b/.travis/README.md index 5f3d65105..03ac2edd6 100644 --- a/.travis/README.md +++ b/.travis/README.md @@ -4,7 +4,7 @@ - GITHUB_TOKEN - GitHub token with push access to repository - DOCKER_USERNAME - Username (netdatabot) with write access to docker hub repository -- DOCKER_PASS - Password to docker hub +- DOCKER_PWD - Password to docker hub - encrypted_8daf19481253_key - key needed by openssl to decrypt GCS credentials file - encrypted_8daf19481253_iv - IV needed by openssl to decrypt GCS credentials file - COVERITY_SCAN_TOKEN - Token to allow coverity test analysis uploads diff --git a/.travis/create_artifacts.sh b/.travis/create_artifacts.sh index 2c142e8d0..9670f229a 100755 --- a/.travis/create_artifacts.sh +++ b/.travis/create_artifacts.sh @@ -1,11 +1,24 @@ -#!/bin/bash +#!/usr/bin/env bash +# +# Artifacts creation script. +# This script generates two things: +# 1) The static binary that can run on all linux distros (built-in dependencies etc) +# 2) The distribution source tarbal +# +# Copyright: SPDX-License-Identifier: GPL-3.0-or-later +# +# Author: Paul Emm. Katsoulakis <paul@netdata.cloud> +# # shellcheck disable=SC2230 set -e -if [ ! -f .gitignore ]; then - echo "Run as ./travis/$(basename "$0") from top level directory of git repository" - exit 1 +# If we are not in netdata git repo, at the top level directory, fail +TOP_LEVEL=$(basename "$(git rev-parse --show-toplevel)") +CWD=$(git rev-parse --show-cdup || echo "") +if [ -n "${CWD}" ] || [ ! "${TOP_LEVEL}" == "netdata" ]; then + echo "Run as .travis/$(basename "$0") from top level directory of netdata git repository" + exit 1 fi if [ ! "${TRAVIS_REPO_SLUG}" == "netdata/netdata" ]; then @@ -13,12 +26,9 @@ if [ ! "${TRAVIS_REPO_SLUG}" == "netdata/netdata" ]; then exit 0 fi; + echo "--- Initialize git configuration ---" -export GIT_MAIL="bot@netdata.cloud" -export GIT_USER="netdatabot" -git config user.email "${GIT_MAIL}" -git config user.name "${GIT_USER}" -git checkout master +git checkout "${1-master}" git pull # Everything from this directory will be uploaded to GCS diff --git a/.travis/draft_release.sh b/.travis/draft_release.sh index bfdfdfb0c..ddc0f9ad5 100755 --- a/.travis/draft_release.sh +++ b/.travis/draft_release.sh @@ -23,10 +23,6 @@ if [ ! -f .gitignore ]; then fi echo "--- Initialize git configuration ---" -export GIT_MAIL="bot@netdata.cloud" -export GIT_USER="netdatabot" -git config user.email "${GIT_MAIL}" -git config user.name "${GIT_USER}" git checkout master git pull diff --git a/.travis/generate_changelog_and_tag_release.sh b/.travis/generate_changelog_and_tag_release.sh index 0f3d1bb5d..fb155b264 100755 --- a/.travis/generate_changelog_and_tag_release.sh +++ b/.travis/generate_changelog_and_tag_release.sh @@ -48,8 +48,6 @@ fi echo "--- Initialize git configuration ---" export GIT_MAIL="bot@netdata.cloud" export GIT_USER="netdatabot" -git config user.email "${GIT_MAIL}" -git config user.name "${GIT_USER}" git checkout master git pull @@ -62,7 +60,7 @@ echo "---- GENERATE CHANGELOG -----" git add CHANGELOG.md echo "---- COMMIT AND PUSH CHANGES ----" -git commit -m "[ci skip] release $GIT_TAG" +git commit -m "[ci skip] release $GIT_TAG" --author "${GIT_USER} <${GIT_MAIL}>" git tag "$GIT_TAG" -a -m "Automatic tag generation for travis build no. $TRAVIS_BUILD_NUMBER" git push "https://${GITHUB_TOKEN}:@$(git config --get remote.origin.url | sed -e 's/^https:\/\///')" git push "https://${GITHUB_TOKEN}:@$(git config --get remote.origin.url | sed -e 's/^https:\/\///')" --tags diff --git a/.travis/generate_changelog_for_nightlies.sh b/.travis/generate_changelog_for_nightlies.sh index 763acc16b..68491fa9b 100755 --- a/.travis/generate_changelog_for_nightlies.sh +++ b/.travis/generate_changelog_for_nightlies.sh @@ -38,8 +38,6 @@ if [ ! "${TRAVIS_REPO_SLUG}" == "netdata/netdata" ]; then exit 0 fi -git config user.email "${GIT_MAIL}" -git config user.name "${GIT_USER}" git checkout master git pull @@ -58,7 +56,7 @@ echo "Changelog created! Adding packaging/version(${NEW_VERSION}) and CHANGELOG. echo "${NEW_VERSION}" > packaging/version git add packaging/version && echo "1) Added packaging/version to repository" || FAIL=1 git add CHANGELOG.md && echo "2) Added changelog file to repository" || FAIL=1 -git commit -m '[ci skip] create nightly packages and update changelog' && echo "3) Committed changes to repository" || FAIL=1 +git commit -m '[ci skip] create nightly packages and update changelog' --author "${GIT_USER} <${GIT_MAIL}>" && echo "3) Committed changes to repository" || FAIL=1 git push "https://${GITHUB_TOKEN}:@${PUSH_URL}" && echo "4) Pushed changes to remote ${PUSH_URL}" || FAIL=1 # In case of a failure, wrap it up and bail out cleanly |