October 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 752c35ca9673c91a9edff84f2efaabe4d04c9c60 Merge: 93be7275e 14b197a14 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:23:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 63aff4a43e0ed2b50632beb4e630f2504881538e Merge: 63581d55a 54e2d0dc2 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:48 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.2] Travis: Use macOS 10.14 with Xcode 11.2
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 14b197a148dbafd197141799d9d611244418aa5e Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:41:17 2019 +1000 Travis: Use macOS 10.14 with Xcode 11.2 Closes ticket 32241. --- .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d429e1537..59f9ae74c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,10 +103,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 000000000..4243cec17 --- /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.

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 54e2d0dc2d790a9e84ec44db2d53d535d8076602 Merge: e56e7e865 15d67842f Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 15d67842f9c1cb993491cf473478999dace7c6c2 Merge: e03db9934 752c35ca9 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:32 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --cc .travis.yml index 4ded5e25a,4ea9400b8..7f0e78587 --- a/.travis.yml +++ b/.travis.yml @@@ -145,19 -106,13 +145,20 @@@ addons ## Always installed, because manual brew installs are hard to get right - asciidoc - xmlto + ## Utilities + ## 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 + - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi + install: ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 2395800d3e333ec4637ece4bee0a0a1af81c0cbc Merge: d7c40beea 63aff4a43 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:55 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 752c35ca9673c91a9edff84f2efaabe4d04c9c60 Merge: 93be7275e 14b197a14 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:23:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.1] Travis: Use macOS 10.14 with Xcode 11.2
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 14b197a148dbafd197141799d9d611244418aa5e Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:41:17 2019 +1000 Travis: Use macOS 10.14 with Xcode 11.2 Closes ticket 32241. --- .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d429e1537..59f9ae74c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,10 +103,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 000000000..4243cec17 --- /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.

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 54e2d0dc2d790a9e84ec44db2d53d535d8076602 Merge: e56e7e865 15d67842f Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:40 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 28 Oct '19

28 Oct '19

commit 15d67842f9c1cb993491cf473478999dace7c6c2 Merge: e03db9934 752c35ca9 Author: teor <teor(a)torproject.org> Date: Tue Oct 29 08:26:32 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 .travis.yml | 7 ++++--- changes/ticket32241 | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --cc .travis.yml index 4ded5e25a,4ea9400b8..7f0e78587 --- a/.travis.yml +++ b/.travis.yml @@@ -145,19 -106,13 +145,20 @@@ addons ## Always installed, because manual brew installs are hard to get right - asciidoc - xmlto + ## Utilities + ## 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 + - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi + install: ## If we're on OSX, configure ccache (ccache is automatically installed and configured on Linux) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi

1 0