]> git.ipfire.org Git - thirdparty/git.git/commitdiff
CI: remove Travis CI support
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 23 Nov 2021 16:29:08 +0000 (17:29 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Nov 2021 00:51:53 +0000 (16:51 -0800)
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 since f003a91f5c5 (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 from
522354d70f4 (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. See 0f0c51181df (travis-ci: install packages
in 'ci/install-dependencies.sh', 2018-11-01).

Remove the "linux-gcc-4.8" job added in fb9d7431cf4 (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>
.travis.yml [deleted file]
ci/install-dependencies.sh
ci/lib.sh
ci/print-test-failures.sh
ci/run-build-and-tests.sh
ci/run-docker-build.sh
ci/run-docker.sh

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644 (file)
index 908330a..0000000
+++ /dev/null
@@ -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
index 1d0e48f451558e685602ac362270d169b42caa92..49a4ae7a9882c469974b481d4120dd632172dac3 100755 (executable)
@@ -13,7 +13,6 @@ UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev
 
 case "$jobname" in
 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 -y install language-pack-is libsvn-perl apache2 \
                $UBUNTU_COMMON_PKGS
@@ -77,7 +76,7 @@ Documentation)
        test -n "$ALREADY_HAVE_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 -y install $UBUNTU_COMMON_PKGS
        ;;
index 82cb17f8eea732967860ffe5b6c82f5be92d96c7..73d959e87f7500328b98249d32c72e660b0369e3 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -34,7 +34,7 @@ save_good_tree () {
 # successfully before (e.g. because the branch got rebased, changing only
 # the commit messages).
 skip_good_tree () {
-       if test "$TRAVIS_DEBUG_MODE" = true || test true = "$GITHUB_ACTIONS"
+       if test true = "$GITHUB_ACTIONS"
        then
                return
        fi
@@ -60,7 +60,7 @@ skip_good_tree () {
                        cat <<-EOF
                        $(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.
-                       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'.
                        EOF
                fi
@@ -91,29 +91,7 @@ export MAKEFLAGS=
 # and installing dependencies.
 set -ex
 
-if test true = "$TRAVIS"
-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"
+if test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
 then
        CI_TYPE=azure-pipelines
        # We are running in Azure Pipelines
@@ -130,10 +108,6 @@ then
        # among *all* phases)
        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_TEST_OPTS="--verbose-log -x --write-junit-xml"
        MAKEFLAGS="$MAKEFLAGS --jobs=10"
@@ -214,11 +188,6 @@ osx-clang|osx-gcc)
        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)
        ;;
index c70d6cdbf243db05f9e5718070895abd837d617a..57277eefcd0c8b6117fd71e9adb3a526baa05ef1 100755 (executable)
@@ -39,8 +39,6 @@ do
                test_name="${test_name##*/}"
                trash_dir="trash directory.$test_name"
                case "$CI_TYPE" in
-               travis)
-                       ;;
                azure-pipelines)
                        mkdir -p failed-test-artifacts
                        mv "$trash_dir" failed-test-artifacts
@@ -88,11 +86,3 @@ do
                fi
        fi
 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
index cc62616d8063cb5eadc18636d561b52a71253d90..18056501ec2caa231c559ae0575cf0b6b32bf3e6 100755 (executable)
@@ -41,9 +41,9 @@ linux-clang)
        export GIT_TEST_DEFAULT_HASH=sha256
        make test
        ;;
-linux-gcc-4.8|pedantic)
+pedantic)
        # Don't run the tests; we only care about whether Git can be
-       # built with GCC 4.8 or with pedantic
+       # built.
        ;;
 *)
        make test
index 8d47a5fda3b1c929a68662cfca3625e63e122194..5d2764ad3a3755e12d7b307c69b6727dc712cac8 100755 (executable)
@@ -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
index 37fa372052ddb8a9aa9fb6a42ed3866a316a1227..b610dd4db84a3011ba7b5f8db744d598bc0b5b20 100755 (executable)
@@ -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 \