From 0236b994e431482e8a36e242f408b37efb378bb0 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 10 Jan 2019 10:25:44 +0100 Subject: [PATCH] fix travis --- .travis.yml | 9 ++++++++- .travis/build-mac.bash | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82dd95a865..e0fb2a162a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,14 @@ matrix: install: "docker pull rpcs3/rpcs3-travis-trusty:1.0" script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash' - os: osx - osx_image: xcode10 + osx_image: xcode10.1 + addons: + homebrew: + packages: + - ccache + - glew + - ninja + - qt script: "/bin/bash -ex .travis/build-mac.bash" cache: ccache diff --git a/.travis/build-mac.bash b/.travis/build-mac.bash index 62fd3800e3..38960eaba4 100644 --- a/.travis/build-mac.bash +++ b/.travis/build-mac.bash @@ -1,4 +1,3 @@ -brew install ccache glew ninja qt export CCACHE_SLOPPINESS=pch_defines,time_macros export CMAKE_PREFIX_PATH=/usr/local/opt/qt5/ export PATH="/usr/local/opt/ccache/libexec:$PATH" @@ -10,7 +9,7 @@ sudo perl -pi -e 'BEGIN{undef $/;} s/(_LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS[ # Setup vulkan and gfx-rs/portability curl -sLO https://github.com/gfx-rs/portability/releases/download/latest/gfx-portability-macos-latest.zip unzip -: gfx-portability-macos-latest.zip -curl -sLO https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.85.0.zip +curl -sLO https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.92.0.zip unzip -: sdk-*.zip mkdir vulkan-sdk ln -s ${PWD}/Vulkan-Headers*/include vulkan-sdk/include