From 69749a88cd9c22c28f4f6053647e9eeb8b997927 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 7 Mar 2019 23:32:23 -0500 Subject: [PATCH] travis: Bump macOS version to 10.14 For whatever bizarre reason, Apple only made a few of std::optional's member functions available on newer SDK versions. Given we can't even run yuzu on macOS, and we keep the builder around to ensure that it always at least compiles on macOS, we can bump this up a version. --- .travis.yml | 2 +- .travis/macos/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0fbe3c5f5..9512f78431 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - os: osx env: NAME="macos build" sudo: false - osx_image: xcode10 + osx_image: xcode10.1 install: "./.travis/macos/deps.sh" script: "./.travis/macos/build.sh" after_success: "./.travis/macos/upload.sh" diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index 4a14837fcf..b7b4c6f8cf 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -2,7 +2,7 @@ set -o pipefail -export MACOSX_DEPLOYMENT_TARGET=10.13 +export MACOSX_DEPLOYMENT_TARGET=10.14 export Qt5_DIR=$(brew --prefix)/opt/qt5 export UNICORNDIR=$(pwd)/externals/unicorn export PATH="/usr/local/opt/ccache/libexec:$PATH"