From dfe8d9a81710789a8ef3c33d3a03bc049aa64b25 Mon Sep 17 00:00:00 2001 From: Stavros Aronis Date: Sat, 17 Oct 2020 18:05:54 +0200 Subject: [PATCH] Use ts on Travis --- .travis.yml | 11 ++++++++--- .travis/{maybe_cover => run} | 3 ++- .travis/travis_enable_cover_if_latest | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) rename .travis/{maybe_cover => run} (91%) diff --git a/.travis.yml b/.travis.yml index 227311ed3..5d024035d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,9 +65,9 @@ jobs: env: # FLAG is used by Codecov reporter (.travis/after_success) - - TEST=".travis/maybe_cover make tests-1" FLAG="tests-1" - - TEST=".travis/maybe_cover make tests-2" FLAG="tests-2" - - TEST=".travis/maybe_cover make tests-real" FLAG="tests_real" + - TEST=".travis/run make tests-1" FLAG="tests-1" + - TEST=".travis/run make tests-2" FLAG="tests-2" + - TEST=".travis/run make tests-real" FLAG="tests_real" otp_release: @@ -88,6 +88,11 @@ otp_release: # Travis build steps configuration +addons: + apt: + packages: + - moreutils + cache: timeout: 5 directories: diff --git a/.travis/maybe_cover b/.travis/run similarity index 91% rename from .travis/maybe_cover rename to .travis/run index f7a0e0640..9858c8969 100755 --- a/.travis/maybe_cover +++ b/.travis/run @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -euo pipefail DIR=$(dirname $(readlink -f $0)) . $DIR/travis_enable_cover_if_latest @@ -10,4 +11,4 @@ if [ "$ENABLE_COVER" = "true" ]; then export CONCUERROR_COVER=$TOP/cover/data fi -$@ +$@ | ts diff --git a/.travis/travis_enable_cover_if_latest b/.travis/travis_enable_cover_if_latest index 197bb24bd..53bf0f249 100644 --- a/.travis/travis_enable_cover_if_latest +++ b/.travis/travis_enable_cover_if_latest @@ -9,6 +9,7 @@ REPO_LATEST=`$DIR/get_latest_travis $TOP/.travis.yml` if [ "$REPO_LATEST" = "$TRAVIS_OTP_RELEASE" ]; then if [ -z ${FLAG+x} ]; then + ENABLE_COVER=false echo "FLAG not set, so no coverage generated" else ENABLE_COVER=true