ci: build Git with GCC 9 in the 'osx-gcc' build job

Our 'osx-gcc' build job on Travis CI relied on GCC 8 being installed
(but not linked) in the image we use [1].  Alas, since the last update
of this image a few days ago this is not the case anymore, and now it
contains GCC 9 (installed and linked) instead of GCC 8.  The results
are failed 'osx-gcc' jobs, because they can't find the 'gcc-8' command
[2].

Let's move on to use GCC 9, with hopefully better error reporting and
improved -Wfoo flags and what not.  On Travis CI this has the benefit
that we can spare a few seconds while installing dependencies, because
it already comes pre-installed, at least for now.  The Azure Pipelines
OSX image doesn't include GCC, so we have to install it ourselves
anyway, and then we might as well install the newer version.

In a vain attempt I tried to future-proof this a bit:

  - Install 'gcc@9' specifically, so we'll still get what we want even
    after GCC 10 comes out, and the "plain" 'gcc' package starts to
    refer to 'gcc@10'.

  - Run both 'brew install gcc@9' and 'brew link gcc@9'.  If 'gcc@9'
    is already installed and linked, then both commands are noop and
    exit with success.  But as we saw in the past, sometimes the image
    contains the expected GCC package installed but not linked, so
    maybe it will happen again in the future as well.  In that case
    'brew install' is still a noop, and instructs the user to run
    'brew link' instead, so that's what we'll do.  And if 'gcc@9' is
    not installed, then 'brew install' will install it, and the
    subsequent 'brew link' becomes a noop.

An additional benefit of this patch is that from now on we won't
unnecessarily install GCC and its dependencies in the 'osx-clang' jobs
on Azure Pipelines.

[1] 7d4733c501 (ci: fix GCC install in the Travis CI GCC OSX job,
    2019-10-24)
[2] https://travis-ci.org/git/git/jobs/615442297#L333

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 8cc72503cb768573bc6d284eb57910ba6ca5a5cb..814e16f094a6045fd3fa7765e407e4d791ab6959 100755 (executable)
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -43,7 +43,10 @@ osx-clang|osx-gcc)
        brew install caskroom/cask/perforce
        case "$jobname" in
        osx-gcc)
-               brew link gcc@8
+               brew install gcc@9
+               # Just in case the image is updated to contain gcc@9
+               # pre-installed but not linked.
+               brew link gcc@9
                ;;
        esac
        ;;

diff --git a/ci/lib.sh b/ci/lib.sh
index 44db2d5cbb2241c7bd3ffd69d15a73c1fd4357ae..bbaaa2934ef467f9d13e46c9134f1792aa9f2881 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -126,7 +126,6 @@ then
                echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
        }
 
-       BREW_INSTALL_PACKAGES=gcc@8
        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"
@@ -177,7 +176,7 @@ linux-clang|linux-gcc)
 osx-clang|osx-gcc)
        if [ "$jobname" = osx-gcc ]
        then
-               export CC=gcc-8
+               export CC=gcc-9
        fi
 
        # t9810 occasionally fails on Travis CI OS X