diff options
author | Micah Anderson <micah@riseup.net> | 2017-04-25 13:42:14 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2017-04-25 13:42:14 -0400 |
commit | f5d1850e7b3831b1ee6374627bb403aa3858a320 (patch) | |
tree | 586704daefadface9d6380ff9596ecb64f00c8bf /tests | |
parent | 64d0b3f97c02dc502a4d6e44b62379170792de8e (diff) |
Fix the pipefail by putting ts inside of ci-build.sh
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/platform-ci/ci-build.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/platform-ci/ci-build.sh b/tests/platform-ci/ci-build.sh index a9731fca..b39f6874 100755 --- a/tests/platform-ci/ci-build.sh +++ b/tests/platform-ci/ci-build.sh @@ -22,6 +22,11 @@ set -e # so exit codes will be caught correctly. set -o pipefail +# we wrap the whole script in curly braces so we can pipe it all through ts to +# get timestamps. If we put it outside of the script, then we can't get proper +# pipefail results. + +{ # leap_platform/tests/platform-ci # shellcheck disable=SC2086 ROOTDIR=$(readlink -f "$(dirname $0)") @@ -117,3 +122,4 @@ case "$CI_ENVIRONMENT_NAME" in [ -f "nodes/${NAME}.json" ] && /bin/rm "nodes/${NAME}.json" ;; esac +} | /usr/bin/ts -s |