diff options
| author | teor <teor@torproject.org> | 2019-10-29 08:26:28 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-29 08:26:28 +1000 |
| commit | 9343b4120001ce788d11eae0d7f41340e93f044c (patch) | |
| tree | 161636c4582f79ee97daeeb3bb3a65fbd840902c | |
| parent | 79105b55b79ac1846a25de69c28d9f4b0e0111d1 (diff) | |
| parent | 752c35ca9673c91a9edff84f2efaabe4d04c9c60 (diff) | |
| download | tor-9343b4120001ce788d11eae0d7f41340e93f044c.tar.gz tor-9343b4120001ce788d11eae0d7f41340e93f044c.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | changes/ticket32241 | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 1bb401690a..4ea9400b88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,10 +107,11 @@ addons: - asciidoc - xmlto -## (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 install: ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) diff --git a/changes/ticket32241 b/changes/ticket32241 new file mode 100644 index 0000000000..4243cec175 --- /dev/null +++ b/changes/ticket32241 @@ -0,0 +1,2 @@ + o Testing (continuous integration): + - In Travis, use Xcode 11.2 on macOS 10.14. Closes ticket 32241. |