]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ab/ci-updates'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:49 +0000 (09:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:49 +0000 (09:39 -0800)
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

1  2 
.github/workflows/main.yml
ci/lib.sh

Simple merge
diff --cc ci/lib.sh
index 994050f7e7b4c6166ca101a1dbbf7bb65378d00c,cbc2f8f1caa6c0ddf69824b03e9394aecbcac250..9d28ab50fb4462a1b064e8c89cd5f13518fd86cd
+++ b/ci/lib.sh
@@@ -214,17 -191,12 +191,13 @@@ macos-latest
        else
                MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)"
        fi
-       # t9810 occasionally fails on Travis CI OS X
-       # t9816 occasionally fails with "TAP out of sequence errors" on
-       # Travis CI OS X
-       export GIT_SKIP_TESTS="t9810 t9816"
-       ;;
- linux-gcc-default)
        ;;
- Linux32)
+ esac
+ case "$jobname" in
+ linux32)
        CC=gcc
 +      MAKEFLAGS="$MAKEFLAGS NO_UNCOMPRESS2=1"
        ;;
  linux-musl)
        CC=gcc