diff options
| author | teor <teor@torproject.org> | 2019-10-29 08:26:48 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-29 08:26:48 +1000 |
| commit | 63aff4a43e0ed2b50632beb4e630f2504881538e (patch) | |
| tree | b97fb3d7a0636f2ee5b1a8c6f81242afe5ce12de /.travis.yml | |
| parent | 63581d55a691e56cde121194558db8a139ab9e74 (diff) | |
| parent | 54e2d0dc2d790a9e84ec44db2d53d535d8076602 (diff) | |
| download | tor-63aff4a43e0ed2b50632beb4e630f2504881538e.tar.gz tor-63aff4a43e0ed2b50632beb4e630f2504881538e.zip | |
Merge branch 'maint-0.4.0' into maint-0.4.1
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a3b17fed7e..237e5ed1ee 100644 --- a/.travis.yml +++ b/.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 |