diff options
| author | teor <teor@torproject.org> | 2019-10-29 08:23:35 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-29 08:23:35 +1000 |
| commit | 752c35ca9673c91a9edff84f2efaabe4d04c9c60 (patch) | |
| tree | 79787aa8a8b29e8fc36aa09d4cc052511e333f3c | |
| parent | 93be7275ecb5bb3c3e2964bb5179f26e926d7f10 (diff) | |
| parent | 14b197a148dbafd197141799d9d611244418aa5e (diff) | |
| download | tor-752c35ca9673c91a9edff84f2efaabe4d04c9c60.tar.gz tor-752c35ca9673c91a9edff84f2efaabe4d04c9c60.zip | |
Merge remote-tracking branch 'tor-github/pr/1460' into maint-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. |