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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove homebrew update on Travis #1500

Merged
merged 4 commits into from Mar 27, 2020
Merged

Remove homebrew update on Travis #1500

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6bcf69
Remove home-brew update.
DavidMansolino Mar 25, 2020
d649563
Update .travis.yml
DavidMansolino Mar 26, 2020
2237007
Update .travis.yml
DavidMansolino Mar 26, 2020
45431bf
Update .travis.yml
DavidMansolino Mar 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -62,12 +62,13 @@ jobs:
language: generic # Travis doesn't support python on macos yet
addons:
homebrew:
update: true # TODO: this should be removed once this bug is fixed: https://travis-ci.community/t/macos-build-fails-because-of-homebrew-bundle-unknown-command/7296
packages:
- clang-format
- cppcheck
- python
install:
- sudo easy_install pip #聽TODO: remove once https://travis-ci.community/t/missed-pip-after-xcode-image-update/7802 is fixed
- pip install --upgrade pip
- pip install -r tests/sources/requirements.txt
- pip install -r docs/tests/requirements.txt
- cp dependencies/.clang-format-9 .clang-format
Expand Down Expand Up @@ -235,7 +236,6 @@ jobs:
language: generic # Travis doesn't support python on macos yet
addons: &mac_addons
homebrew:
update: true # TODO: this should be removed once this bug is fixed: https://travis-ci.community/t/macos-build-fails-because-of-homebrew-bundle-unknown-command/7296
packages:
- python
- cmake
Expand All @@ -246,6 +246,8 @@ jobs:
- export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
- export PATH=/usr/local/bin/:$PATH # Prefer Brew binaries over Travis ones.
- npm install -g appdmg
- sudo easy_install pip #聽TODO: remove once https://travis-ci.community/t/missed-pip-after-xcode-image-update/7802 is fixed
- pip install --upgrade pip
- pip install PyGithub # used to upload packages to Github releases
- sudo mkdir -p /Library/Frameworks/Python.framework/Versions/3.7 # we can't use python3.7 from homebrew for the compilation because it is not compatible with the normal one
- if [[ ! -f $WEBOTS_HOME/dependencies/python3.7.zip ]]; then wget -qq https://cyberbotics.com/files/repository/dependencies/mac/release/python3.7.zip -P $WEBOTS_HOME/dependencies; fi
Expand Down