Просмотр исходного кода

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.
Lioncash 7 лет назад
Родитель
Сommit
69749a88cd
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      .travis.yml
  2. 1 1
      .travis/macos/build.sh

+ 1 - 1
.travis.yml

@@ -24,7 +24,7 @@ matrix:
     - os: osx
     - os: osx
       env: NAME="macos build"
       env: NAME="macos build"
       sudo: false
       sudo: false
-      osx_image: xcode10
+      osx_image: xcode10.1
       install: "./.travis/macos/deps.sh"
       install: "./.travis/macos/deps.sh"
       script: "./.travis/macos/build.sh"
       script: "./.travis/macos/build.sh"
       after_success: "./.travis/macos/upload.sh"
       after_success: "./.travis/macos/upload.sh"

+ 1 - 1
.travis/macos/build.sh

@@ -2,7 +2,7 @@
 
 
 set -o pipefail
 set -o pipefail
 
 
-export MACOSX_DEPLOYMENT_TARGET=10.13
+export MACOSX_DEPLOYMENT_TARGET=10.14
 export Qt5_DIR=$(brew --prefix)/opt/qt5
 export Qt5_DIR=$(brew --prefix)/opt/qt5
 export UNICORNDIR=$(pwd)/externals/unicorn
 export UNICORNDIR=$(pwd)/externals/unicorn
 export PATH="/usr/local/opt/ccache/libexec:$PATH"
 export PATH="/usr/local/opt/ccache/libexec:$PATH"