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

[tor/maint-0.4.2] Merge branch 'ticket32177_029' into ticket32177_035
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 92ad87b8082423af2b9873c921eebce5cc5fe296 Merge: 4b8e5ea0d 511aeba8e Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:37:32 2019 +1000 Merge branch 'ticket32177_029' into ticket32177_035 Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029. .travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc .travis.yml index 65088d556,7c7fcf4f6..147ca41df --- a/.travis.yml +++ b/.travis.yml @@@ -37,30 -30,18 +37,31 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## We check NSS + ## NSS is a fast job, clang is slower on Linux, so we do NSS clang + - env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + ## We run rust on Linux, because it's faster than rust on macOS + ## We check rust offline + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## We check asciidoc with distcheck, to make sure we remove doc products - ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + ## We check disable module dirauth + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## We run rust on macOS, because we have seen macOS rust failures before + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + os: osx ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded.

1 0

[tor/maint-0.4.2] Travis: Disable the Rust macOS build
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 4c4a0d50ff4fd01862b78e8cbfaabfa9e4d4ae12 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:38:50 2019 +1000 Travis: Disable the Rust macOS build This build was added in 0.3.5. We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 147ca41df..1523ba8ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,9 +53,10 @@ matrix: ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" ## We run rust on macOS, because we have seen macOS rust failures before - - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # compiler: clang + # os: osx ## We run chutney on macOS, because macOS Travis has IPv6 # Disabled due to slow Travis macOS builds, see #32177 #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"

1 0

[tor/maint-0.4.2] Travis: Disable all but one macOS build
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 511aeba8eeb24a953228e00917f64703059a7673 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:34:47 2019 +1000 Travis: Disable all but one macOS build We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177. --- .travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 564c97dbf..7c7fcf4f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,8 +39,9 @@ matrix: ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. diff --git a/changes/ticket32177 b/changes/ticket32177 new file mode 100644 index 000000000..6d6816acd --- /dev/null +++ b/changes/ticket32177 @@ -0,0 +1,3 @@ + o Testing: + - Disable all but one Travis CI macOS build, to mitigate slow scheduling + of Travis macOS jobs. Closes ticket 32177.

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit bed439013394dc083c525d91129868071619c39b Merge: 4c4a0d50f f420b60c1 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 20:47:44 2019 +1000 Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5 .appveyor.yml | 8 ++++---- changes/ticket32086 | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'ticket32177_041' into ticket32177_042
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 8f84999f581d8dc51d4636f4b02aea2748448802 Merge: 7a35c8d8b 86b171473 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:44:58 2019 +1000 Merge branch 'ticket32177_041' into ticket32177_042 Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build from ticket32177_041. .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --cc .travis.yml index c65923d2c,221fab71c..f9f13c856 --- a/.travis.yml +++ b/.travis.yml @@@ -57,12 -53,14 +57,14 @@@ matrix ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" ## We run rust on macOS, because we have seen macOS rust failures before - - env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - compiler: clang - os: osx + # Disabled due to slow Travis macOS builds, see #32177 - #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" ++ #- env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # compiler: clang + # os: osx ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx ## We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"

1 0

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

22 Oct '19

commit f98b59524c44843d992688562fde27cbbedc11f9 Merge: 8f84999f5 2318bb237 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 20:48:20 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

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

22 Oct '19

commit 9bb0ca122f13255982566b440b0b9d03b6a9e44b Merge: 89ead08ee bed439013 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 20:48:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)

1 0

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

22 Oct '19

commit 2318bb237fa9ce908efdb0cf89dbeaffe3871939 Merge: 53aa15963 9bb0ca122 Author: teor <teor(a)torproject.org> Date: Tue Oct 22 20:48:13 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.4.2] Merge branch 'ticket32177_040' into ticket32177_041
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 86b1714731f0e2679be4ab1a8aa7cb62730ba4bb Merge: 53aa15963 868bcc24e Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:43:38 2019 +1000 Merge branch 'ticket32177_040' into ticket32177_041 .travis.yml | 12 +++++++----- changes/ticket32177 | 3 +++ 2 files changed, 10 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'ticket32177_029' into ticket32177_035
by teor＠torproject.org 22 Oct '19

22 Oct '19

commit 92ad87b8082423af2b9873c921eebce5cc5fe296 Merge: 4b8e5ea0d 511aeba8e Author: teor <teor(a)torproject.org> Date: Tue Oct 22 19:37:32 2019 +1000 Merge branch 'ticket32177_029' into ticket32177_035 Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029. .travis.yml | 5 +++-- changes/ticket32177 | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc .travis.yml index 65088d556,7c7fcf4f6..147ca41df --- a/.travis.yml +++ b/.travis.yml @@@ -37,30 -30,18 +37,31 @@@ matrix ## We run basic tests on macOS - compiler: clang os: osx + ## We check NSS + ## NSS is a fast job, clang is slower on Linux, so we do NSS clang + - env: NSS_OPTIONS="--enable-nss" + compiler: clang ## We run chutney on Linux, because it's faster than chutney on macOS - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + ## We include a single coverage build with the best options for coverage + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + ## We run rust on Linux, because it's faster than rust on macOS + ## We check rust offline + - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true ## We check asciidoc with distcheck, to make sure we remove doc products - ## We use Linux clang, because there are no other Linux clang jobs - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" + ## We check disable module dirauth + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## We run rust on macOS, because we have seen macOS rust failures before + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" + os: osx ## We run chutney on macOS, because macOS Travis has IPv6 - - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - os: osx + # Disabled due to slow Travis macOS builds, see #32177 + #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + # os: osx + ## We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded.

1 0