Skip to content

Commit b8a7680

Browse files
committed
Merge branch 'master' into dev
2 parents f64c550 + 5229146 commit b8a7680

2 files changed

Lines changed: 5 additions & 15 deletions

File tree

.travis.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,23 +60,16 @@ matrix:
6060
CMAKE_FLAGS="-DWITH_SIMD=0"
6161
CTEST_OUTPUT_ON_FAILURE=1
6262

63-
addons:
64-
homebrew:
65-
brewfile: true
66-
update: true
67-
68-
cache:
69-
directories:
70-
- $HOME/Library/Caches/Homebrew
71-
72-
before_cache:
73-
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
74-
7563
before_install:
7664
- if [ "$BUILD_X32" = "1" ]; then
7765
sudo apt -y --install-recommends install libc6-dev-x32;
7866
fi
7967
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
68+
pushd $HOME/Downloads &&
69+
curl -LO https://raw.githubusercontent.com/GiovanniBussi/macports-ci/master/macports-ci &&
70+
. ./macports-ci install &&
71+
sudo /opt/local/bin/port -N install gcc6 yasm md5sha1sum &&
72+
popd &&
8073
git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
8174
ln -fs /Applications/Xcode.app /Applications/Xcode83.app;
8275
fi

Brewfile

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)