commit 15d67842f9c1cb993491cf473478999dace7c6c2 parent e03db9934a0d26da0b119a2d15d51c4c658af1c8 Author: teor <teor@torproject.org> Date: Tue, 29 Oct 2019 08:26:32 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 Diffstat:
| M | .travis.yml | | | 7 | ++++--- |
| A | changes/ticket32241 | | | 2 | ++ |
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml @@ -149,10 +149,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 diff --git a/changes/ticket32241 b/changes/ticket32241 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241.