diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2018-12-28 21:12:02 -0800 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-12-29 06:12:02 +0100 |
| commit | d65c6ba9b2df0fd376797587f572175bf0818f61 (patch) | |
| tree | 863f376a76460297c351eb9d5885278991fc96e5 | |
| parent | 5f957920c4cac213daece3bb069b5622445ca3fd (diff) | |
| download | spack-d65c6ba9b2df0fd376797587f572175bf0818f61.tar.gz spack-d65c6ba9b2df0fd376797587f572175bf0818f61.tar.bz2 spack-d65c6ba9b2df0fd376797587f572175bf0818f61.tar.xz spack-d65c6ba9b2df0fd376797587f572175bf0818f61.zip | |
Use homebrew addon instead of manually invoking brew (#10213)
| -rw-r--r-- | .travis.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 9008302810..65e8f0c2e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -129,6 +129,7 @@ sudo: false # Docs need graphviz to build addons: + # for Linux builds, we use APT apt: packages: - ccache @@ -143,6 +144,13 @@ addons: - r-base-dev - perl - perl-base + # for Mac builds, we use Homebrew + homebrew: + packages: + - python@2 + - gcc + - gnupg2 + - ccache # ~/.ccache needs to be cached directly as Travis is not taking care of it # (possibly because we use 'language: python' and not 'language: c') @@ -156,13 +164,6 @@ cache: # Work around Travis's lack of support for Python on OSX before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - brew update; - export HOMEBREW_NO_AUTO_UPDATE=1; - rm /usr/local/include/c++ ; - brew ls --versions python@2 > /dev/null || brew install python@2; - brew ls --versions gcc > /dev/null || brew install gcc; - brew ls --versions gnupg2 > /dev/null || brew install gnupg2; - brew ls --versions ccache > /dev/null || brew install ccache; pip2 install --upgrade pip; pip2 install virtualenv; virtualenv venv; |