Unverified Commit 2395800d authored by teor's avatar teor
Browse files

Merge branch 'maint-0.4.1' into maint-0.4.2

parents d7c40bee 63aff4a4
...@@ -153,10 +153,11 @@ addons: ...@@ -153,10 +153,11 @@ addons:
## preventing or diagnosing hangs ## preventing or diagnosing hangs
- timelimit - timelimit
## (OSX only) Use the default OSX image ## (OSX only) Use a recent macOS image
## See https://docs.travis-ci.com/user/reference/osx#os-x-version ## See https://docs.travis-ci.com/user/reference/osx#os-x-version
## Default is Xcode 9.4 on macOS 10.13 as of August 2018 ## Default is Xcode 9.4 on macOS 10.13 as of October 2019
#osx_image: xcode9.4 ## Recent is Xcode 11.2 on macOS 10.14 as of October 2019
osx_image: xcode11.2
before_install: before_install:
## Create empty rust directories for non-Rust builds, so caching succeeds ## Create empty rust directories for non-Rust builds, so caching succeeds
......
o Testing (continuous integration):
- In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment