Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI: Homebrew: Update logic for removal of c++ if installed on the sys. #5

Merged
merged 3 commits into from
Dec 19, 2018
Merged

CI: Homebrew: Update logic for removal of c++ if installed on the sys. #5

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d5d929
CI: Homebrew: Update logic for removal of c++ if installed on the sys…
dmey Dec 19, 2018
40c05b3
fix comment
dmey Dec 19, 2018
2576541
fix comment
dmey Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
CI: Homebrew: Update logic for removal of c++ if installed on the sys… 
…tem.
  • Loading branch information
@dmey
dmey committed Dec 19, 2018
commit 3d5d9293b0a363a72d8f3cbf959aa39c2c77949c
5 changes: 3 additions & 2 deletions .ci/travis/setup-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ if [[ $TRAVIS_OS_NAME == 'linux' ]]; then

elif [[ $TRAVIS_OS_NAME == 'osx' ]]; then

# Homebrew fails during "brew link" if c++ is already present.
if command -v /usr/local/include/c++; then rm '/usr/local/include/c++'; fi
# If c++ is already present on the system, homebrew fails to install gcc.
# We use the `f` flag in case c++ is not present to suppress the error message.
dmey marked this conversation as resolved.
Show resolved Hide resolved
rm -f /usr/local/include/c++

brew update
brew install gcc netcdf jasper
Expand Down