diff options
| author | teor <teor@torproject.org> | 2019-10-29 08:27:02 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-29 08:27:02 +1000 |
| commit | b448f6044d37959f2b9bea3c5c2bc5f98c4d9170 (patch) | |
| tree | 622da56c6e741b799b5e59fe6675d9241daa0287 | |
| parent | bf16efeb07a9bc58f6f6c90e79f3d3a0798cf8d0 (diff) | |
| parent | 2395800d3e333ec4637ece4bee0a0a1af81c0cbc (diff) | |
| download | tor-b448f6044d37959f2b9bea3c5c2bc5f98c4d9170.tar.gz tor-b448f6044d37959f2b9bea3c5c2bc5f98c4d9170.zip | |
Merge branch 'maint-0.4.2'
| -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 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 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. |