diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2017-10-05 12:16:49 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2017-10-05 12:16:49 +0100 |
| commit | 3b98adfe2e65273f8a240ad6fcd1c1c135ffdabc (patch) | |
| tree | 7e1bd9e757588a617a29aa693fedd3388bbf0d1e | |
| parent | 044244e9bbd3f69d3ccd003d127dcfe4878c8dd6 (diff) | |
| download | ocaml-3b98adfe2e65273f8a240ad6fcd1c1c135ffdabc.tar.gz | |
Hopefully eliminate race condition in AppVeyor build script
| -rw-r--r-- | appveyor_build.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/appveyor_build.sh b/appveyor_build.sh index 12d5c07bef..60e5f2fdc2 100644 --- a/appveyor_build.sh +++ b/appveyor_build.sh @@ -111,12 +111,14 @@ case "$1" in run "make opt" make opt run "make opt.opt" make opt.opt + set +e + # For an explanation of the sed command, see https://github.com/appveyor/ci/issues/1824 - (tail --pid=$BUILD_PID -n +1 -f ../build-mingw32/build.log & echo $! >&3) 3>pid | sed -e 's/\d027\[K//g' -e 's/\d027\[m/\d027[0m/g' -e 's/\d027\[01\([m;]\)/\d027[1\1/g' & - TAIL_PID=$(<pid) + tail --pid=$BUILD_PID -n +1 -f ../build-mingw32/build.log | sed -e 's/\d027\[K//g' -e 's/\d027\[m/\d027[0m/g' -e 's/\d027\[01\([m;]\)/\d027[1\1/g' & + TAIL_PID=$! wait $BUILD_PID STATUS=$? - wait $TAIL_PID 2>/dev/null + wait $TAIL_PID exit $STATUS ;; esac |