diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-09-07 04:29:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 04:29:01 -0400 |
| commit | 3e4574df6add2715ebdb34e26878347f9a52e93e (patch) | |
| tree | f91fa20c71fed4023508d93383b4fa4e92ac5d55 /.travis | |
| parent | 88144b69c034233ea3eedfd16cf68843b8a4b5d9 (diff) | |
Revert "add Travis ctrl file for checking if changes happened (#11383)" (#11486)
This reverts commit 5123aee6c99cdec5dbe6abca1763d0950b2a2ee7.
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/create_artifacts.sh | 15 | ||||
| -rwxr-xr-x | .travis/generate_changelog_for_nightlies.sh | 5 | ||||
| -rwxr-xr-x | .travis/nightlies.sh | 3 |
3 files changed, 2 insertions, 21 deletions
diff --git a/.travis/create_artifacts.sh b/.travis/create_artifacts.sh index ddeff94c8b..fca2ae72b5 100755 --- a/.travis/create_artifacts.sh +++ b/.travis/create_artifacts.sh @@ -26,21 +26,6 @@ if [ ! "${TRAVIS_REPO_SLUG}" == "netdata/netdata" ]; then exit 0 fi -# if nightlies.sh has not written this TRAVIS_BUILD_NUMBER, there's no -# changes from last nigthly -if [ -f .travis/current_build_status ]; then - FILE_TRAVIS_BUILD_NUMBER=$(cut -d'#' -f2 < .travis/current_build_status) - FILE_TRAVIS_BUILD_STATUS=$(cut -d- -f1 < .travis/current_build_status) - if [[ ${FILE_TRAVIS_BUILD_NUMBER} -eq ${TRAVIS_BUILD_NUMBER} ]] && [[ ${FILE_TRAVIS_BUILD_STATUS} == "changes" ]]; then - echo "Changes happen since last nightly release, let's continue" - else - echo "No changes since last nightly release, nothing else to do" - exit 0 - fi -else - echo "File .travis/current_build_status doesn't exist, probably this is the very first build, let's continue" -fi - echo "--- Initialize git configuration ---" git checkout "${1-master}" git pull diff --git a/.travis/generate_changelog_for_nightlies.sh b/.travis/generate_changelog_for_nightlies.sh index 0cfc3e1557..59173af3f6 100755 --- a/.travis/generate_changelog_for_nightlies.sh +++ b/.travis/generate_changelog_for_nightlies.sh @@ -37,9 +37,8 @@ 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 add .travis/current_build_status && echo "3) Added travis current build status file to repository" || FAIL=1 -git commit -m '[ci skip] create nightly packages and update changelog' --author "${GIT_USER} <${GIT_MAIL}>" && echo "4) Committed changes to repository" || FAIL=1 -git push "https://${GITHUB_TOKEN}:@${PUSH_URL}" && echo "5) Pushed changes to remote ${PUSH_URL}" || 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 if [ $FAIL -eq 1 ]; then diff --git a/.travis/nightlies.sh b/.travis/nightlies.sh index 1679afb237..7240a784d6 100755 --- a/.travis/nightlies.sh +++ b/.travis/nightlies.sh @@ -31,9 +31,6 @@ PREVIOUS_NIGHTLY_COUNT="$(rev <packaging/version | cut -d- -f 2 | rev)" if [ "${COMMITS_SINCE_RELEASE}" == "${PREVIOUS_NIGHTLY_COUNT}" ]; then echo "No changes since last nightly release, nothing else to do" exit 0 -else - echo "Changes happen since last nightly release" - echo "changes-#${TRAVIS_BUILD_NUMBER}" > .travis/current_build_status fi if [ ! "${TRAVIS_REPO_SLUG}" == "netdata/netdata" ]; then |