Skip to content

Commit ef3ce7c

Browse files
committed
Merge branch 'sg/osx-force-gcc-9'
TravisCI update. * sg/osx-force-gcc-9: ci: build Git with GCC 9 in the 'osx-gcc' build job
2 parents 083378c + 176441b commit ef3ce7c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

ci/install-dependencies.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ osx-clang|osx-gcc)
4949
brew install caskroom/cask/perforce
5050
case "$jobname" in
5151
osx-gcc)
52-
brew link gcc ||
53-
brew link gcc@8
52+
brew install gcc@9
53+
# Just in case the image is updated to contain gcc@9
54+
# pre-installed but not linked.
55+
brew link gcc@9
5456
;;
5557
esac
5658
;;

ci/lib.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ then
131131
echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
132132
}
133133

134-
BREW_INSTALL_PACKAGES=gcc@8
135134
export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
136135
export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
137136
MAKEFLAGS="$MAKEFLAGS --jobs=10"
@@ -182,7 +181,7 @@ linux-clang|linux-gcc)
182181
osx-clang|osx-gcc)
183182
if [ "$jobname" = osx-gcc ]
184183
then
185-
export CC=gcc-8
184+
export CC=gcc-9
186185
fi
187186

188187
# t9810 occasionally fails on Travis CI OS X

0 commit comments

Comments
 (0)