Merge branch 'master' into dev
This commit is contained in:
17
.travis.yml
17
.travis.yml
@@ -60,23 +60,16 @@ matrix:
|
|||||||
CMAKE_FLAGS="-DWITH_SIMD=0"
|
CMAKE_FLAGS="-DWITH_SIMD=0"
|
||||||
CTEST_OUTPUT_ON_FAILURE=1
|
CTEST_OUTPUT_ON_FAILURE=1
|
||||||
|
|
||||||
addons:
|
|
||||||
homebrew:
|
|
||||||
brewfile: true
|
|
||||||
update: true
|
|
||||||
|
|
||||||
cache:
|
|
||||||
directories:
|
|
||||||
- $HOME/Library/Caches/Homebrew
|
|
||||||
|
|
||||||
before_cache:
|
|
||||||
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [ "$BUILD_X32" = "1" ]; then
|
- if [ "$BUILD_X32" = "1" ]; then
|
||||||
sudo apt -y --install-recommends install libc6-dev-x32;
|
sudo apt -y --install-recommends install libc6-dev-x32;
|
||||||
fi
|
fi
|
||||||
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
||||||
|
pushd $HOME/Downloads &&
|
||||||
|
curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci &&
|
||||||
|
. ./macports-ci install &&
|
||||||
|
sudo /opt/local/bin/port -N install gcc6 yasm md5sha1sum &&
|
||||||
|
popd &&
|
||||||
git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
|
git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
|
||||||
ln -fs /Applications/Xcode.app /Applications/Xcode83.app;
|
ln -fs /Applications/Xcode.app /Applications/Xcode83.app;
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user