diff options
| author | Jack Lloyd <[email protected]> | 2017-08-31 11:29:23 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-08-31 11:29:23 -0400 |
| commit | 41909798cb60b6e729ab0c0a178d67a83d1c55a9 (patch) | |
| tree | af4e28156516b36138ffc461d4a564957adede50 /src/scripts/ci/setup_travis.sh | |
| parent | c35727e813a9434c351f0a7ffb28ff67452001fb (diff) | |
Some attempts at speeding up CI
First do amalgamation build on static instead of shared build. This
is arbitrary, except that we do 3 shared builds, and only one static
lib build, and the amalgamation kind of screws up ccache.
Also avoid installing LZMA or Python3 on OS X. Just running Homebrew
to install turns out to be significantly more expensive than either
building the library or running the tests (!).
Removes the workaround for homebrew #42553 because apparently it
is fixed now.
Diffstat (limited to 'src/scripts/ci/setup_travis.sh')
| -rwxr-xr-x | src/scripts/ci/setup_travis.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/scripts/ci/setup_travis.sh b/src/scripts/ci/setup_travis.sh index 268cd5869..74822a725 100755 --- a/src/scripts/ci/setup_travis.sh +++ b/src/scripts/ci/setup_travis.sh @@ -75,16 +75,10 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then fi elif [ "$TRAVIS_OS_NAME" = "osx" ]; then - # Workaround for https://github.com/Homebrew/homebrew/issues/42553 - brew update || brew update - + brew update brew install ccache if [ "$BUILD_MODE" != "cross-arm32" ] && [ "$BUILD_MODE" != "cross-arm64" ]; then - brew install xz - # Python2 is already installed - brew install python3 - # Boost 1.58 is installed on Travis OS X images # brew install boost fi |