diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:49 -0800 |
| commit | f9b889dd67b7a92fd78d9f3385fd2f83e9efdaa8 (patch) | |
| tree | 36e63822514a2b34d3cbe1d7f80f5857f34ce19d /ci/run-docker.sh | |
| parent | 250ca49b4f3ee0781a98c47f4515ae597ca3dbab (diff) | |
| parent | 25715419bf4d105d755e0f6d2228e1ac0bd06b88 (diff) | |
| download | git-f9b889dd67b7a92fd78d9f3385fd2f83e9efdaa8.tar.xz | |
Merge branch 'ab/ci-updates'
Drop support for TravisCI and update test workflows at GitHub.
* ab/ci-updates:
CI: don't run "make test" twice in one job
CI: use "$runs_on_pool", not "$jobname" to select packages & config
CI: rename the "Linux32" job to lower-case "linux32"
CI: use shorter names that fit in UX tooltips
CI: remove Travis CI support
Diffstat (limited to 'ci/run-docker.sh')
| -rwxr-xr-x | ci/run-docker.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/run-docker.sh b/ci/run-docker.sh index 37fa372052..af89d1624a 100755 --- a/ci/run-docker.sh +++ b/ci/run-docker.sh @@ -6,7 +6,7 @@ . ${0%/*}/lib.sh case "$jobname" in -Linux32) +linux32) CI_CONTAINER="daald/ubuntu32:xenial" ;; linux-musl) @@ -25,7 +25,7 @@ docker pull "$CI_CONTAINER" # root@container:/# export jobname=<jobname> # root@container:/# /usr/src/git/ci/run-docker-build.sh <host-user-id> -container_cache_dir=/tmp/travis-cache +container_cache_dir=/tmp/container-cache docker run \ --interactive \ |