summaryrefslogtreecommitdiff
path: root/ci/run-linux32-build.sh
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2018-01-29 17:17:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-30 21:27:18 (GMT)
commit04d47e969a1fb952baffbd12a1a0dd2dc6cd2746 (patch)
tree0236e99e1f6510aefb923044a6d6643990721f58 /ci/run-linux32-build.sh
parentf63b12392aa16a8a7a68900afa906b0382345aad (diff)
downloadgit-04d47e969a1fb952baffbd12a1a0dd2dc6cd2746.zip
git-04d47e969a1fb952baffbd12a1a0dd2dc6cd2746.tar.gz
git-04d47e969a1fb952baffbd12a1a0dd2dc6cd2746.tar.bz2
travis-ci: use 'set -e' in the 32 bit Linux build job
The script 'ci/run-linux32-build.sh' running inside the Docker container of the 32 bit Linux build job uses an && chain to break the build if one of the commands fails. This is problematic for two reasons: - The && chain is broken, because there is this in the middle: test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER) && Luckily it is broken in a way that it didn't lead to false successes. If installing dependencies fails, then the rest of the first && chain is skipped and execution resumes after the || operator. At that point $HOST_UID is still unset, causing 'useradd' to error out with "invalid user ID 'ci'", which in turn causes the second && chain to abort the script and thus break the build. - All other 'ci/*' scripts use 'set -e' to break the build if one of the commands fails. This inconsistency among these scripts is asking for trouble: I forgot about the && chain more than once while working on this patch series. Enable 'set -e' for the whole script and for the commands executed under 'su' as well. While touching every line in the 'su' command block anyway, change their indentation to use a tab instead of spaces. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci/run-linux32-build.sh')
-rwxr-xr-xci/run-linux32-build.sh20
1 files changed, 10 insertions, 10 deletions
diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh
index 5a36a8d..2481839 100755
--- a/ci/run-linux32-build.sh
+++ b/ci/run-linux32-build.sh
@@ -6,29 +6,29 @@
# run-linux32-build.sh [host-user-id]
#
-set -x
+set -ex
# Update packages to the latest available versions
linux32 --32bit i386 sh -c '
apt update >/dev/null &&
apt install -y build-essential libcurl4-openssl-dev libssl-dev \
libexpat-dev gettext python >/dev/null
-' &&
+'
# If this script runs inside a docker container, then all commands are
# usually executed as root. Consequently, the host user might not be
# able to access the test output files.
# If a host user id is given, then create a user "ci" with the host user
# id to make everything accessible to the host user.
-HOST_UID=$1 &&
-CI_USER=$USER &&
-test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER) &&
+HOST_UID=$1
+CI_USER=$USER
+test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER)
# Build and test
linux32 --32bit i386 su -m -l $CI_USER -c '
- set -x &&
- cd /usr/src/git &&
- ln -s /tmp/travis-cache/.prove t/.prove &&
- make --jobs=2 &&
- make --quiet test
+ set -ex
+ cd /usr/src/git
+ ln -s /tmp/travis-cache/.prove t/.prove
+ make --jobs=2
+ make --quiet test
'