CI: remove Travis CI support
Remove support for running the CI in travis. The last builds in it are from 5 months ago[1] (as of 2021-11-19), and our documentation has referred to GitHub CI instead sincemaintf003a91f5c(SubmittingPatches: replace discussion of Travis with GitHub Actions, 2021-07-22). We'll now run the "t9810 t9816" and tests on OSX. We didn't before, as we'd carried the Travis exclusion of them forward from522354d70f(Add Travis CI support, 2015-11-27). Let's hope whatever issue there was with them was either Travis specific, or fixed since then (I'm not sure). The "apt-add-repository" invocation (which we were doing in GitHub CI) isn't needed, it was another Travis-only case that was carried forward into more general code. See0f0c51181d(travis-ci: install packages in 'ci/install-dependencies.sh', 2018-11-01). Remove the "linux-gcc-4.8" job added infb9d7431cf(travis-ci: build with GCC 4.8 as well, 2019-07-18), it only ran in Travis CI. 1. https://travis-ci.org/github/git/git/builds Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
							parent
							
								
									cd3e606211
								
							
						
					
					
						commit
						4a6e4b9602
					
				
							
								
								
									
										60
									
								
								.travis.yml
								
								
								
								
							
							
						
						
									
										60
									
								
								.travis.yml
								
								
								
								
							|  | @ -1,60 +0,0 @@ | ||||||
| language: c |  | ||||||
|  |  | ||||||
| cache: |  | ||||||
|   directories: |  | ||||||
|     - $HOME/travis-cache |  | ||||||
|  |  | ||||||
| os: |  | ||||||
|   - linux |  | ||||||
|   - osx |  | ||||||
|  |  | ||||||
| osx_image: xcode10.1 |  | ||||||
|  |  | ||||||
| compiler: |  | ||||||
|   - clang |  | ||||||
|   - gcc |  | ||||||
|  |  | ||||||
| matrix: |  | ||||||
|   include: |  | ||||||
|     - env: jobname=linux-gcc-default |  | ||||||
|       os: linux |  | ||||||
|       compiler: |  | ||||||
|       addons: |  | ||||||
|       before_install: |  | ||||||
|     - env: jobname=linux-gcc-4.8 |  | ||||||
|       os: linux |  | ||||||
|       dist: trusty |  | ||||||
|       compiler: |  | ||||||
|     - env: jobname=Linux32 |  | ||||||
|       os: linux |  | ||||||
|       compiler: |  | ||||||
|       addons: |  | ||||||
|       services: |  | ||||||
|         - docker |  | ||||||
|       before_install: |  | ||||||
|       script: ci/run-docker.sh |  | ||||||
|     - env: jobname=linux-musl |  | ||||||
|       os: linux |  | ||||||
|       compiler: |  | ||||||
|       addons: |  | ||||||
|       services: |  | ||||||
|         - docker |  | ||||||
|       before_install: |  | ||||||
|       script: ci/run-docker.sh |  | ||||||
|     - env: jobname=StaticAnalysis |  | ||||||
|       os: linux |  | ||||||
|       compiler: |  | ||||||
|       script: ci/run-static-analysis.sh |  | ||||||
|       after_failure: |  | ||||||
|     - env: jobname=Documentation |  | ||||||
|       os: linux |  | ||||||
|       compiler: |  | ||||||
|       script: ci/test-documentation.sh |  | ||||||
|       after_failure: |  | ||||||
|  |  | ||||||
| before_install: ci/install-dependencies.sh |  | ||||||
| script: ci/run-build-and-tests.sh |  | ||||||
| after_failure: ci/print-test-failures.sh |  | ||||||
|  |  | ||||||
| notifications: |  | ||||||
|   email: false |  | ||||||
|  | @ -13,7 +13,6 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev | ||||||
|  |  | ||||||
| case "$jobname" in | case "$jobname" in | ||||||
| linux-clang|linux-gcc|linux-leaks) | linux-clang|linux-gcc|linux-leaks) | ||||||
| 	sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" |  | ||||||
| 	sudo apt-get -q update | 	sudo apt-get -q update | ||||||
| 	sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ | 	sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ | ||||||
| 		$UBUNTU_COMMON_PKGS | 		$UBUNTU_COMMON_PKGS | ||||||
|  | @ -77,7 +76,7 @@ Documentation) | ||||||
| 	test -n "$ALREADY_HAVE_ASCIIDOCTOR" || | 	test -n "$ALREADY_HAVE_ASCIIDOCTOR" || | ||||||
| 	sudo gem install --version 1.5.8 asciidoctor | 	sudo gem install --version 1.5.8 asciidoctor | ||||||
| 	;; | 	;; | ||||||
| linux-gcc-default|linux-gcc-4.8) | linux-gcc-default) | ||||||
| 	sudo apt-get -q update | 	sudo apt-get -q update | ||||||
| 	sudo apt-get -q -y install $UBUNTU_COMMON_PKGS | 	sudo apt-get -q -y install $UBUNTU_COMMON_PKGS | ||||||
| 	;; | 	;; | ||||||
|  |  | ||||||
							
								
								
									
										37
									
								
								ci/lib.sh
								
								
								
								
							
							
						
						
									
										37
									
								
								ci/lib.sh
								
								
								
								
							|  | @ -34,7 +34,7 @@ save_good_tree () { | ||||||
| # successfully before (e.g. because the branch got rebased, changing only | # successfully before (e.g. because the branch got rebased, changing only | ||||||
| # the commit messages). | # the commit messages). | ||||||
| skip_good_tree () { | skip_good_tree () { | ||||||
| 	if test "$TRAVIS_DEBUG_MODE" = true || test true = "$GITHUB_ACTIONS" | 	if test true = "$GITHUB_ACTIONS" | ||||||
| 	then | 	then | ||||||
| 		return | 		return | ||||||
| 	fi | 	fi | ||||||
|  | @ -60,7 +60,7 @@ skip_good_tree () { | ||||||
| 			cat <<-EOF | 			cat <<-EOF | ||||||
| 			$(tput setaf 2)Skipping build job for commit $CI_COMMIT.$(tput sgr0) | 			$(tput setaf 2)Skipping build job for commit $CI_COMMIT.$(tput sgr0) | ||||||
| 			This commit's tree has already been built and tested successfully in build job $prev_good_job_number for commit $prev_good_commit. | 			This commit's tree has already been built and tested successfully in build job $prev_good_job_number for commit $prev_good_commit. | ||||||
| 			The log of that build job is available at $(url_for_job_id $prev_good_job_id) | 			The log of that build job is available at $SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$prev_good_job_id | ||||||
| 			To force a re-build delete the branch's cache and then hit 'Restart job'. | 			To force a re-build delete the branch's cache and then hit 'Restart job'. | ||||||
| 			EOF | 			EOF | ||||||
| 		fi | 		fi | ||||||
|  | @ -91,29 +91,7 @@ export MAKEFLAGS= | ||||||
| # and installing dependencies. | # and installing dependencies. | ||||||
| set -ex | set -ex | ||||||
|  |  | ||||||
| if test true = "$TRAVIS" | if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI" | ||||||
| then |  | ||||||
| 	CI_TYPE=travis |  | ||||||
| 	# When building a PR, TRAVIS_BRANCH refers to the *target* branch. Not |  | ||||||
| 	# what we want here. We want the source branch instead. |  | ||||||
| 	CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}" |  | ||||||
| 	CI_COMMIT="$TRAVIS_COMMIT" |  | ||||||
| 	CI_JOB_ID="$TRAVIS_JOB_ID" |  | ||||||
| 	CI_JOB_NUMBER="$TRAVIS_JOB_NUMBER" |  | ||||||
| 	CI_OS_NAME="$TRAVIS_OS_NAME" |  | ||||||
| 	CI_REPO_SLUG="$TRAVIS_REPO_SLUG" |  | ||||||
|  |  | ||||||
| 	cache_dir="$HOME/travis-cache" |  | ||||||
|  |  | ||||||
| 	url_for_job_id () { |  | ||||||
| 		echo "https://travis-ci.org/$CI_REPO_SLUG/jobs/$1" |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	BREW_INSTALL_PACKAGES="git-lfs gettext" |  | ||||||
| 	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save" |  | ||||||
| 	export GIT_TEST_OPTS="--verbose-log -x --immediate" |  | ||||||
| 	MAKEFLAGS="$MAKEFLAGS --jobs=2" |  | ||||||
| elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI" |  | ||||||
| then | then | ||||||
| 	CI_TYPE=azure-pipelines | 	CI_TYPE=azure-pipelines | ||||||
| 	# We are running in Azure Pipelines | 	# We are running in Azure Pipelines | ||||||
|  | @ -130,10 +108,6 @@ then | ||||||
| 	# among *all* phases) | 	# among *all* phases) | ||||||
| 	cache_dir="$HOME/test-cache/$SYSTEM_PHASENAME" | 	cache_dir="$HOME/test-cache/$SYSTEM_PHASENAME" | ||||||
|  |  | ||||||
| 	url_for_job_id () { |  | ||||||
| 		echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1" |  | ||||||
| 	} |  | ||||||
|  |  | ||||||
| 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save" | 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save" | ||||||
| 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml" | 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml" | ||||||
| 	MAKEFLAGS="$MAKEFLAGS --jobs=10" | 	MAKEFLAGS="$MAKEFLAGS --jobs=10" | ||||||
|  | @ -214,11 +188,6 @@ osx-clang|osx-gcc) | ||||||
| 	else | 	else | ||||||
| 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" | 		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=$(which python2)" | ||||||
| 	fi | 	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) | linux-gcc-default) | ||||||
| 	;; | 	;; | ||||||
|  |  | ||||||
|  | @ -39,8 +39,6 @@ do | ||||||
| 		test_name="${test_name##*/}" | 		test_name="${test_name##*/}" | ||||||
| 		trash_dir="trash directory.$test_name" | 		trash_dir="trash directory.$test_name" | ||||||
| 		case "$CI_TYPE" in | 		case "$CI_TYPE" in | ||||||
| 		travis) |  | ||||||
| 			;; |  | ||||||
| 		azure-pipelines) | 		azure-pipelines) | ||||||
| 			mkdir -p failed-test-artifacts | 			mkdir -p failed-test-artifacts | ||||||
| 			mv "$trash_dir" failed-test-artifacts | 			mv "$trash_dir" failed-test-artifacts | ||||||
|  | @ -88,11 +86,3 @@ do | ||||||
| 		fi | 		fi | ||||||
| 	fi | 	fi | ||||||
| done | done | ||||||
|  |  | ||||||
| if [ $combined_trash_size -gt 0 ] |  | ||||||
| then |  | ||||||
| 	echo "------------------------------------------------------------------------" |  | ||||||
| 	echo "Trash directories embedded in this log can be extracted by running:" |  | ||||||
| 	echo |  | ||||||
| 	echo "  curl https://api.travis-ci.org/v3/job/$TRAVIS_JOB_ID/log.txt |./ci/util/extract-trash-dirs.sh" |  | ||||||
| fi |  | ||||||
|  |  | ||||||
|  | @ -41,9 +41,9 @@ linux-clang) | ||||||
| 	export GIT_TEST_DEFAULT_HASH=sha256 | 	export GIT_TEST_DEFAULT_HASH=sha256 | ||||||
| 	make test | 	make test | ||||||
| 	;; | 	;; | ||||||
| linux-gcc-4.8|pedantic) | pedantic) | ||||||
| 	# Don't run the tests; we only care about whether Git can be | 	# Don't run the tests; we only care about whether Git can be | ||||||
| 	# built with GCC 4.8 or with pedantic | 	# built. | ||||||
| 	;; | 	;; | ||||||
| *) | *) | ||||||
| 	make test | 	make test | ||||||
|  |  | ||||||
|  | @ -47,15 +47,6 @@ else | ||||||
| 	else | 	else | ||||||
| 		useradd -u $HOST_UID $CI_USER | 		useradd -u $HOST_UID $CI_USER | ||||||
| 	fi | 	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 | fi | ||||||
|  |  | ||||||
| # Build and test | # Build and test | ||||||
|  |  | ||||||
|  | @ -25,7 +25,7 @@ docker pull "$CI_CONTAINER" | ||||||
| # root@container:/# export jobname=<jobname> | # root@container:/# export jobname=<jobname> | ||||||
| # root@container:/# /usr/src/git/ci/run-docker-build.sh <host-user-id> | # 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 \ | docker run \ | ||||||
| 	--interactive \ | 	--interactive \ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Ævar Arnfjörð Bjarmason
						Ævar Arnfjörð Bjarmason