Browse Source

Merge branch 'maint-0.3.5' into maint-0.4.0

teor 4 years ago
parent
commit
54e2d0dc2d
2 changed files with 6 additions and 3 deletions
  1. 4 3
      .travis.yml
  2. 2 0
      changes/ticket32241

+ 4 - 3
.travis.yml

@@ -151,10 +151,11 @@ addons:
       ## preventing or diagnosing hangs
       - 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
-## Default is Xcode 9.4 on macOS 10.13 as of August 2018
-#osx_image: xcode9.4
+## Default is Xcode 9.4 on macOS 10.13 as of October 2019
+## Recent is Xcode 11.2 on macOS 10.14 as of October 2019
+osx_image: xcode11.2
 
 before_install:
   ## Create empty rust directories for non-Rust builds, so caching succeeds

+ 2 - 0
changes/ticket32241

@@ -0,0 +1,2 @@
+  o Testing (continuous integration):
+    - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.