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

.travis.yml

+4 −3
Original line number Diff line number Diff line
@@ -153,10 +153,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

changes/ticket32241

0 → 100644
+2 −0
Original line number Diff line number Diff line 
  o Testing (continuous integration):

    - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.