From aae895b10c68efd737ea7f0ec4b9210da37c0366 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 22 Nov 2019 12:13:59 +0100 Subject: [PATCH] Fail on all errors in Bash scripts. --- build-docker-image.sh | 3 ++- ci/azure-install-rust.yml | 10 +++++++--- ci/test.sh | 3 ++- docker/android-ndk.sh | 3 ++- docker/android-system.sh | 3 ++- docker/cmake.sh | 3 ++- docker/common.sh | 3 ++- docker/dragonfly.sh | 3 ++- docker/dropbear.sh | 3 ++- docker/emscripten-entry.sh | 2 +- docker/emscripten.sh | 3 ++- docker/freebsd.sh | 3 ++- docker/linux-image.sh | 3 ++- docker/musl.sh | 3 ++- docker/netbsd.sh | 3 ++- docker/qemu.sh | 3 ++- docker/solaris.sh | 3 ++- docker/xargo.sh | 3 ++- 18 files changed, 40 insertions(+), 20 deletions(-) diff --git a/build-docker-image.sh b/build-docker-image.sh index fd16c0de9..68cf604fb 100755 --- a/build-docker-image.sh +++ b/build-docker-image.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail cd docker diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index fc98089ce..d9202f53c 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -2,7 +2,8 @@ steps: - bash: | - set -e + set -euo pipefail + if command -v rustup; then echo `command -v rustup` `rustup -V` already installed rustup self update @@ -17,13 +18,16 @@ steps: displayName: Install rustup - bash: | - set -e + set -euo pipefail + rustup update $TOOLCHAIN rustup default $TOOLCHAIN displayName: Install rust - bash: | - set -ex + set -x + set -euo pipefail + rustup -V rustc -Vv cargo -V diff --git a/ci/test.sh b/ci/test.sh index 474e48cad..d16d9f288 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail function retry { local tries=${TRIES-5} diff --git a/docker/android-ndk.sh b/docker/android-ndk.sh index 9fdb94bae..bfce054ba 100755 --- a/docker/android-ndk.sh +++ b/docker/android-ndk.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail NDK_URL=https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip diff --git a/docker/android-system.sh b/docker/android-system.sh index 6325c035e..bce6bbac6 100755 --- a/docker/android-system.sh +++ b/docker/android-system.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local arch=$1 diff --git a/docker/cmake.sh b/docker/cmake.sh index bde1b3c2d..c4a04dcac 100755 --- a/docker/cmake.sh +++ b/docker/cmake.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local version=3.5.1 diff --git a/docker/common.sh b/docker/common.sh index b7f7f4322..05efd82ff 100755 --- a/docker/common.sh +++ b/docker/common.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail apt-get update diff --git a/docker/dragonfly.sh b/docker/dragonfly.sh index a5ba894c0..11dac522d 100755 --- a/docker/dragonfly.sh +++ b/docker/dragonfly.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local binutils=2.25.1 \ diff --git a/docker/dropbear.sh b/docker/dropbear.sh index a0499a971..e31e0777b 100755 --- a/docker/dropbear.sh +++ b/docker/dropbear.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local version=2019.78 \ diff --git a/docker/emscripten-entry.sh b/docker/emscripten-entry.sh index 9e1f3ca07..ed6cdb5f3 100755 --- a/docker/emscripten-entry.sh +++ b/docker/emscripten-entry.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -e +set -euo pipefail export HOME=/emsdk-portable/ diff --git a/docker/emscripten.sh b/docker/emscripten.sh index 31e209f87..c0ce0faae 100755 --- a/docker/emscripten.sh +++ b/docker/emscripten.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local dependencies=( diff --git a/docker/freebsd.sh b/docker/freebsd.sh index 909765374..ef72fc38f 100755 --- a/docker/freebsd.sh +++ b/docker/freebsd.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local arch=$1 diff --git a/docker/linux-image.sh b/docker/linux-image.sh index f8e208b31..f86ef4139 100755 --- a/docker/linux-image.sh +++ b/docker/linux-image.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { # arch in the rust target diff --git a/docker/musl.sh b/docker/musl.sh index 68f23ad39..73deaa9b3 100755 --- a/docker/musl.sh +++ b/docker/musl.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail hide_output() { set +x diff --git a/docker/netbsd.sh b/docker/netbsd.sh index 061647e6a..5ba291892 100755 --- a/docker/netbsd.sh +++ b/docker/netbsd.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local binutils=2.25.1 \ diff --git a/docker/qemu.sh b/docker/qemu.sh index 332875ebd..30a179191 100755 --- a/docker/qemu.sh +++ b/docker/qemu.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local version=4.1.0 diff --git a/docker/solaris.sh b/docker/solaris.sh index 73f6456e6..bb521a64c 100755 --- a/docker/solaris.sh +++ b/docker/solaris.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local arch=$1 diff --git a/docker/xargo.sh b/docker/xargo.sh index 94a8a6271..9717c581a 100755 --- a/docker/xargo.sh +++ b/docker/xargo.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash -set -ex +set -x +set -euo pipefail main() { local dependencies=(