diff options
author | teor <teor@torproject.org> | 2019-10-29 08:26:36 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-10-29 08:26:36 +1000 |
commit | db5df1acfd13dce43858f5048fa542423fec004f (patch) | |
tree | b104e2cfe27a8118da8aa47b8602786ae7e89e59 | |
parent | 6ef634a7754f876a43b0dfbd0e91215b13569cf9 (diff) | |
parent | 15d67842f9c1cb993491cf473478999dace7c6c2 (diff) | |
download | tor-db5df1acfd13dce43858f5048fa542423fec004f.tar.gz tor-db5df1acfd13dce43858f5048fa542423fec004f.zip |
Merge branch 'maint-0.3.5' into release-0.3.5
-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 4ded5e25a7..7f0e785876 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,10 +149,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. |