Skip to content

Commit fa0415f

Browse files
committed
Try to fix Travis-CI macOS failures
1 parent 0fb5759 commit fa0415f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.travis.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ env:
1414
- MPICH_GCC7_BOT_URL_HEAD="https://github.com/sourceryinstitute/OpenCoarrays/files/976779/"
1515
- MPICH_BOT_URL_TAIL="mpich-3.2_3.yosemite.bottle.1.tar.gz"
1616
- BUILD_TYPES="Release Debug RelWithDebInfo CodeCoverage"
17-
matrix:
18-
- GCC=6 OSX_PACKAGES="gcc@6 cmake shellcheck"
19-
- GCC=7 OSX_PACKAGES="gcc cmake shellcheck"
17+
matrix: # shellcheck installed manually below for macOS
18+
- GCC=6 OSX_PACKAGES="gcc@6 cmake"
19+
- GCC=7 OSX_PACKAGES="gcc cmake"
2020

2121
matrix:
2222
fast_finish: true
@@ -137,9 +137,11 @@ install:
137137
if [[ (-n ${TRAVIS}) && (${TRAVIS_OS_NAME} == osx) ]]; then
138138
brew update > /dev/null
139139
140+
[[ "$(brew ls --versions shellcheck)" ]] || brew install --force-bottle shellcheck
141+
brew outdated shellcheck || brew upgrade --force-bottle shellcheck
140142
for pkg in ${OSX_PACKAGES}; do
141-
[[ "$(brew ls --versions ${pkg})" ]] || brew install --force-bottle ${pkg}
142-
brew outdated ${pkg} || brew upgrade --force-bottle ${pkg}
143+
[[ "$(brew ls --versions ${pkg})" ]] || brew install ${pkg}
144+
brew outdated ${pkg} || brew upgrade ${pkg}
143145
done
144146
if [[ ${BUILD_TYPE} == InstallScript ]]; then # uninstall some stuff if present
145147
brew uninstall --force --ignore-dependencies cmake || true

0 commit comments

Comments
 (0)