diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-06 15:09:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-06 15:09:21 -0800 |
| commit | ef3ce7c4b9f5ed7a13a0efcc576df855c4fd3d0f (patch) | |
| tree | 5f8fdcea1a22c49f7cf18a9dd33f87b9a82afadb /ci/install-dependencies.sh | |
| parent | 083378cc35c4dbcc607e4cdd24a5fca440163d17 (diff) | |
| parent | 176441bfb58d8833640300d8db67ef8d7eee56ca (diff) | |
| download | git-ef3ce7c4b9f5ed7a13a0efcc576df855c4fd3d0f.tar.xz | |
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
Diffstat (limited to 'ci/install-dependencies.sh')
| -rwxr-xr-x | ci/install-dependencies.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index b6b4f4707f..cd59855d73 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -49,8 +49,10 @@ osx-clang|osx-gcc) brew install caskroom/cask/perforce case "$jobname" in osx-gcc) - brew link 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 ;; |