diff options
| author | teor <teor@torproject.org> | 2019-10-29 08:26:59 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-29 08:26:59 +1000 |
| commit | dbae58d58001b8404aa805512065d123f2d6ee1a (patch) | |
| tree | d7598107d9deff7a692766351c0e130c9ef190cf | |
| parent | 8f8e1523e0cdf00570edcaa51f4c8564f263202e (diff) | |
| parent | 2395800d3e333ec4637ece4bee0a0a1af81c0cbc (diff) | |
| download | tor-dbae58d58001b8404aa805512065d123f2d6ee1a.tar.gz tor-dbae58d58001b8404aa805512065d123f2d6ee1a.zip | |
Merge branch 'maint-0.4.2' into release-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 13d0db67bc..252da6877a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -153,10 +153,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. |