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-build.sh | |
| parent | Merge branch 'hn/reflog-tests' (diff) | |
| parent | CI: don't run "make test" twice in one job (diff) | |
| download | git-f9b889dd67b7a92fd78d9f3385fd2f83e9efdaa8.tar.gz git-f9b889dd67b7a92fd78d9f3385fd2f83e9efdaa8.zip | |
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-build.sh')
| -rwxr-xr-x | ci/run-docker-build.sh | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ci/run-docker-build.sh b/ci/run-docker-build.sh index 8d47a5fda3..6cd832efb9 100755 --- a/ci/run-docker-build.sh +++ b/ci/run-docker-build.sh @@ -15,7 +15,7 @@ then fi case "$jobname" in -Linux32) +linux32) switch_cmd="linux32 --32bit i386" ;; linux-musl) @@ -47,15 +47,6 @@ else else useradd -u $HOST_UID $CI_USER fi - - # 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 |