diff --git a/.travis.yml b/.travis.yml index 7d06a8e0b7..739b2c62b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ 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.1 + osx_image: xcode10.2 addons: homebrew: packages: diff --git a/.travis/build-mac.bash b/.travis/build-mac.bash index 1503d51922..8327d7de40 100644 --- a/.travis/build-mac.bash +++ b/.travis/build-mac.bash @@ -2,14 +2,10 @@ export CCACHE_SLOPPINESS=pch_defines,time_macros export CMAKE_PREFIX_PATH=/usr/local/opt/qt5/ export PATH="/usr/local/opt/ccache/libexec:$PATH" -# Allow using optional on 10.13 -sudo perl -pi -e 'BEGIN{undef $/;} s/(_LIBCPP_AVAILABILITY_BAD_OPTIONAL_ACCESS[ ]+\\\n[^\n]+10)\.14/\1.13/;' \ - $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/__config - # 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.92.0.zip +curl -sLO https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.1.97.0.zip unzip -: sdk-*.zip mkdir vulkan-sdk ln -s ${PWD}/Vulkan-Headers*/include vulkan-sdk/include