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.
author: Lioncash 2019-03-07 23:32:23 -0500
committer: Lioncash 2019-03-07 23:34:37 -0500
commit: 69749a88cd9c22c28f4f6053647e9eeb8b997927 (patch)
tree: 546a7d26de383140c5508c85ae9cdf5bdff04d00
parent: common/bit_field: Make BitField trivially copyable (diff)
download: yuzu-69749a88cd9c22c28f4f6053647e9eeb8b997927.tar.gz
yuzu-69749a88cd9c22c28f4f6053647e9eeb8b997927.tar.xz
yuzu-69749a88cd9c22c28f4f6053647e9eeb8b997927.zip
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index b0fbe3c5f..9512f7843 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 4a14837fc..b7b4c6f8c 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"
author	Lioncash	2019-03-07 23:32:23 -0500
committer	Lioncash	2019-03-07 23:34:37 -0500
commit	69749a88cd9c22c28f4f6053647e9eeb8b997927 (patch)
tree	546a7d26de383140c5508c85ae9cdf5bdff04d00
parent	common/bit_field: Make BitField trivially copyable (diff)
download	yuzu-69749a88cd9c22c28f4f6053647e9eeb8b997927.tar.gz yuzu-69749a88cd9c22c28f4f6053647e9eeb8b997927.tar.xz yuzu-69749a88cd9c22c28f4f6053647e9eeb8b997927.zip

diff --git a/.travis.yml b/.travis.yml index b0fbe3c5f..9512f7843 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
24	- os: osx	24	- os: osx
25	env: NAME="macos build"	25	env: NAME="macos build"
26	sudo: false	26	sudo: false
27	osx_image: xcode10	27	osx_image: xcode10.1
28	install: "./.travis/macos/deps.sh"	28	install: "./.travis/macos/deps.sh"
29	script: "./.travis/macos/build.sh"	29	script: "./.travis/macos/build.sh"
30	after_success: "./.travis/macos/upload.sh"	30	after_success: "./.travis/macos/upload.sh"


diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index 4a14837fc..b7b4c6f8c 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh
@@ -2,7 +2,7 @@
2		2
3	set -o pipefail	3	set -o pipefail
4		4
5	export MACOSX_DEPLOYMENT_TARGET=10.13	5	export MACOSX_DEPLOYMENT_TARGET=10.14
6	export Qt5_DIR=$(brew --prefix)/opt/qt5	6	export Qt5_DIR=$(brew --prefix)/opt/qt5
7	export UNICORNDIR=$(pwd)/externals/unicorn	7	export UNICORNDIR=$(pwd)/externals/unicorn
8	export PATH="/usr/local/opt/ccache/libexec:$PATH"	8	export PATH="/usr/local/opt/ccache/libexec:$PATH"