From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Dec 2021 17:39:49 +0000 (-0800)
Subject: Merge branch 'ab/ci-updates'
X-Git-Tag: v2.35.0-rc0~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9b889dd67b7a92fd78d9f3385fd2f83e9efdaa8;p=thirdparty%2Fgit.git

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
---

f9b889dd67b7a92fd78d9f3385fd2f83e9efdaa8
diff --cc ci/lib.sh
index 994050f7e7,cbc2f8f1ca..9d28ab50fb
--- a/ci/lib.sh
+++ 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