diff options
| author | jkoan <jkoan@gmx.de> | 2017-08-15 00:25:00 +0200 |
|---|---|---|
| committer | jkoan <jkoan@gmx.de> | 2017-08-15 00:25:00 +0200 |
| commit | 28478e7f26c1a0eedc06fb4765e2f736079c6f0c (patch) | |
| tree | 872224bb836ac766528e7bcbf1c5a7df838b1a60 /ci | |
| parent | 78f9baa46472a1108300860296567f264bffc793 (diff) | |
| download | navit-28478e7f26c1a0eedc06fb4765e2f736079c6f0c.tar.gz | |
we always want the failed code from bash not from tee
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/build.sh | 1 | ||||
| -rw-r--r-- | ci/build.sh~ | 13 |
2 files changed, 1 insertions, 13 deletions
diff --git a/ci/build.sh b/ci/build.sh index 17b19abff..536ab7781 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -6,6 +6,7 @@ for i in $(seq 1 $#); do eval s=\$$i echo "Starting build script #$i : $s" if [ ! -z $CIRCLE_ARTIFACTS ]; then + set -o pipefail bash -e $s 2>&1 | tee $CIRCLE_ARTIFACTS/${i}.log else bash -e $s diff --git a/ci/build.sh~ b/ci/build.sh~ deleted file mode 100644 index da27b0d44..000000000 --- a/ci/build.sh~ +++ /dev/null @@ -1,13 +0,0 @@ -set -e - -echo "$# build script (s) to run" - -for i in $(seq 1 $#); do - eval s=\$$i - echo "Starting build script #$i : $s" - if [ ! -z $CIRCLE_ARTIFACTS ]; then - bash -e $s 2>&1 | tee $CIRCLE_ARTIFACTS/${s}.log - else - bash -e $s - fi -done |