opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Junio C Hamano 2019-12-06 15:09:21 -08:00
parent 083378cc35 176441bfb5
commit ef3ce7c4b9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/install-dependencies.sh
View File

@ -49,8 +49,10 @@ osx-clang|osx-gcc)
brew install caskroom/cask/perforce brew install caskroom/cask/perforce
case "$jobname" in case "$jobname" in
osx-gcc) osx-gcc)
brew link gcc || brew install gcc@9
brew link gcc@8 # Just in case the image is updated to contain gcc@9
# pre-installed but not linked.
brew link gcc@9
;; ;;
esac esac
;; ;;

3
ci/lib.sh
View File

@ -131,7 +131,6 @@ then
echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1" 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_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"
@ -182,7 +181,7 @@ linux-clang|linux-gcc)
osx-clang|osx-gcc) osx-clang|osx-gcc)
if [ "$jobname" = osx-gcc ] if [ "$jobname" = osx-gcc ]
then then
export CC=gcc-8 export CC=gcc-9
fi fi
# t9810 occasionally fails on Travis CI OS X # t9810 occasionally fails on Travis CI OS X