summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-10-29 08:27:02 +1000
committerteor <teor@torproject.org>2019-10-29 08:27:02 +1000
commitb448f6044d37959f2b9bea3c5c2bc5f98c4d9170 (patch)
tree622da56c6e741b799b5e59fe6675d9241daa0287 /.travis.yml
parentbf16efeb07a9bc58f6f6c90e79f3d3a0798cf8d0 (diff)
parent2395800d3e333ec4637ece4bee0a0a1af81c0cbc (diff)
downloadtor-b448f6044d37959f2b9bea3c5c2bc5f98c4d9170.tar.gz
tor-b448f6044d37959f2b9bea3c5c2bc5f98c4d9170.zip
Merge branch 'maint-0.4.2'
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index ea06d21db5..5d5bc330d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -158,10 +158,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