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>

SZEDER Gábor committed Jan 29, 2018 at 18:17 UTC 04d47e969a1fb952baffbd12a1a0dd2dc6cd2746
1 file changed +10 -10
ci/run-linux32-build.sh
+10 -10
@@ -6,29 +6,29 @@
6 # run-linux32-build.sh [host-user-id]
7 #
8
9 -set -x
9 +set -ex
10
11 # Update packages to the latest available versions
12 linux32 --32bit i386 sh -c '
13 apt update >/dev/null &&
14 apt install -y build-essential libcurl4-openssl-dev libssl-dev \
15 libexpat-dev gettext python >/dev/null
16 -' &&
16 +'
17
18 # If this script runs inside a docker container, then all commands are
19 # usually executed as root. Consequently, the host user might not be
20 # able to access the test output files.
21 # If a host user id is given, then create a user "ci" with the host user
22 # id to make everything accessible to the host user.
23 -HOST_UID=$1 &&
24 -CI_USER=$USER &&
25 -test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER) &&
23 +HOST_UID=$1
24 +CI_USER=$USER
25 +test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER)
26
27 # Build and test
28 linux32 --32bit i386 su -m -l $CI_USER -c '
29 - set -x &&
30 - cd /usr/src/git &&
31 - ln -s /tmp/travis-cache/.prove t/.prove &&
32 - make --jobs=2 &&
33 - make --quiet test
29 + set -ex
30 + cd /usr/src/git
31 + ln -s /tmp/travis-cache/.prove t/.prove
32 + make --jobs=2
33 + make --quiet test
34 '