diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/lib-travisci.sh | 7 | ||||
| -rwxr-xr-x | ci/run-linux32-build.sh | 2 | ||||
| -rwxr-xr-x | ci/run-linux32-docker.sh | 5 | ||||
| -rwxr-xr-x | ci/run-tests.sh | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index 07f27c7270..1efee55ef7 100755 --- a/ci/lib-travisci.sh +++ b/ci/lib-travisci.sh @@ -21,8 +21,6 @@ skip_branch_tip_with_tag () { fi } -good_trees_file="$HOME/travis-cache/good-trees" - # Save some info about the current commit's tree, so we can skip the build # job if we encounter the same tree again and can provide a useful info # message. @@ -83,7 +81,10 @@ check_unignored_build_artifacts () # and installing dependencies. set -ex -mkdir -p "$HOME/travis-cache" +cache_dir="$HOME/travis-cache" +good_trees_file="$cache_dir/good-trees" + +mkdir -p "$cache_dir" skip_branch_tip_with_tag skip_good_tree diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index 248183982b..d020b762ca 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -28,7 +28,7 @@ test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER) linux32 --32bit i386 su -m -l $CI_USER -c ' set -ex cd /usr/src/git - ln -s /tmp/travis-cache/.prove t/.prove + test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove make --jobs=2 make --quiet test ' diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh index 4f191c5bb1..15288ea2cf 100755 --- a/ci/run-linux32-docker.sh +++ b/ci/run-linux32-docker.sh @@ -11,6 +11,8 @@ docker pull daald/ubuntu32:xenial # $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial # root@container:/# /usr/src/git/ci/run-linux32-build.sh +container_cache_dir=/tmp/travis-cache + docker run \ --interactive \ --env DEVELOPER \ @@ -18,8 +20,9 @@ docker run \ --env GIT_PROVE_OPTS \ --env GIT_TEST_OPTS \ --env GIT_TEST_CLONE_2GB \ + --env cache_dir="$container_cache_dir" \ --volume "${PWD}:/usr/src/git" \ - --volume "${HOME}/travis-cache:/tmp/travis-cache" \ + --volume "$cache_dir:$container_cache_dir" \ daald/ubuntu32:xenial \ /usr/src/git/ci/run-linux32-build.sh $(id -u $USER) diff --git a/ci/run-tests.sh b/ci/run-tests.sh index 22355f0091..deba73d9b5 100755 --- a/ci/run-tests.sh +++ b/ci/run-tests.sh @@ -5,7 +5,8 @@ . ${0%/*}/lib-travisci.sh -ln -s $HOME/travis-cache/.prove t/.prove +ln -s "$cache_dir/.prove" t/.prove + make --quiet test check_unignored_build_artifacts |