diff --git a/.travis.yml b/.travis.yml index 612a1b9ee8055..5cd9c380728d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,49 +2,49 @@ language: cpp sudo: false matrix: include: - - os: linux - env: ARCH="i686" - compiler: "g++-5 -m32" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - kalakris-cmake - packages: - - cmake - - bar - - time - - binutils - - gcc-5 - - g++-5 - - gcc-5-multilib - - g++-5-multilib - - make:i386 - - libssl-dev:i386 - - gfortran-5 - - gfortran-5-multilib - - os: linux - env: ARCH="x86_64" - compiler: "g++-5 -m64" - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - kalakris-cmake - packages: - - cmake - - bar - - time - - g++-5 - - gfortran-5 + # - os: linux + # env: ARCH="i686" + # compiler: "g++-5 -m32" + # addons: + # apt: + # sources: + # - ubuntu-toolchain-r-test + # - kalakris-cmake + # packages: + # - cmake + # - bar + # - time + # - binutils + # - gcc-5 + # - g++-5 + # - gcc-5-multilib + # - g++-5-multilib + # - make:i386 + # - libssl-dev:i386 + # - gfortran-5 + # - gfortran-5-multilib + # - os: linux + # env: ARCH="x86_64" + # compiler: "g++-5 -m64" + # addons: + # apt: + # sources: + # - ubuntu-toolchain-r-test + # - kalakris-cmake + # packages: + # - cmake + # - bar + # - time + # - g++-5 + # - gfortran-5 - os: osx env: ARCH="x86_64" osx_image: xcode7.3 -cache: - directories: - - $TRAVIS_BUILD_DIR/deps/srccache - - $TRAVIS_BUILD_DIR/deps/scratch - - $TRAVIS_BUILD_DIR/deps/usr-staging +# cache: +# directories: +# - $TRAVIS_BUILD_DIR/deps/srccache +# - $TRAVIS_BUILD_DIR/deps/scratch +# - $TRAVIS_BUILD_DIR/deps/usr-staging branches: only: - master @@ -76,6 +76,9 @@ before_install: echo "override ARCH=$ARCH" >> Make.user; TESTSTORUN="all"; elif [ `uname` = "Darwin" ]; then + rm -rf deps/srccache; + rm -rf deps/scratch; + rm -rf deps/usr-staging; brew update; brew install -v jq bar; BAR="bar";