diff options
-rwxr-xr-x | ci/run-linux32-build.sh | 30 | ||||
-rwxr-xr-x | ci/run-linux32-docker.sh | 2 |
2 files changed, 26 insertions, 6 deletions
diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index d020b762ca..8c1b500e63 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -3,11 +3,17 @@ # Build and test Git in a 32-bit environment # # Usage: -# run-linux32-build.sh [host-user-id] +# run-linux32-build.sh <host-user-id> # set -ex +if test $# -ne 1 || test -z "$1" +then + echo >&2 "usage: run-linux32-build.sh <host-user-id>" + exit 1 +fi + # Update packages to the latest available versions linux32 --32bit i386 sh -c ' apt update >/dev/null && @@ -18,11 +24,25 @@ linux32 --32bit i386 sh -c ' # 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. +# If a non 0 host user id is given, then create a user "ci" with that +# 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) +if test $HOST_UID -eq 0 +then + # Just in case someone does want to run the test suite as root. + CI_USER=root +else + CI_USER=ci + useradd -u $HOST_UID $CI_USER + # Due to a bug the test suite was run as root in the past, so + # a prove state file created back then is only accessible by + # root. Now that bug is fixed, the test suite is run as a + # regular user, but the prove state file coming from Travis + # CI's cache might still be owned by root. + # Make sure that this user has rights to any cached files, + # including an existing prove state file. + test -n "$cache_dir" && chown -R $HOST_UID:$HOST_UID "$cache_dir" +fi # Build and test linux32 --32bit i386 su -m -l $CI_USER -c ' diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh index 15288ea2cf..21637903ce 100755 --- a/ci/run-linux32-docker.sh +++ b/ci/run-linux32-docker.sh @@ -9,7 +9,7 @@ docker pull daald/ubuntu32:xenial # Use the following command to debug the docker build locally: # $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial -# root@container:/# /usr/src/git/ci/run-linux32-build.sh +# root@container:/# /usr/src/git/ci/run-linux32-build.sh <host-user-id> container_cache_dir=/tmp/travis-cache |