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

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

17 Oct '19

commit e483257e1bc826b5678fcbf13084fd5d811f2b12 Merge: a74c18069 4b8e5ea0d Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:51:58 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)

1 0

[tor/maint-0.4.1] Travis: Add a macOS chutney job, but don't wait for it to finish
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 1e0e23c1e48ebc388f7a16a08a3f12e01db15bfa Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:44:41 2019 +1000 Travis: Add a macOS chutney job, but don't wait for it to finish Since Travis macOS has IPv6 support (and Travis Linux does not), chutney will now run its IPv6 networks as part of Travis CI. But since chutney is slow, don't wait for the macOS chutney to finish. (Travis have fixed the duplicate notification bug in fast_finish. So we can use fast_finish and allow_failure to finish early. Unfortunately, allow_failure also means we ignore failures in macOS chutney.) Also make sure that we have: * a compile on each platform, with each compiler, * a check on each platform, and * a check on each compiler. Finally, sort builds: allow fail last, macOS first, slowest first. Closes ticket 30860. Closes ticket 31859 for 0.2.9. --- .travis.yml | 37 ++++++++++++++++++------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index f47fe8bb2..564c97dbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,34 +27,33 @@ env: matrix: ## include creates builds with gcc, linux, unless we override those defaults include: - ## clang is the default macOS compiler, so we use it for the macOS job + ## We run basic tests on macOS - compiler: clang os: osx - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - ## We only want to check these build option combinations once - ## (they shouldn't vary by compiler or OS) - ## We run coverage with hardening off, which seems like enough - # - env: HARDENING_OPTIONS="" + ## 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 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 also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" compiler: clang + ## 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 - ## Uncomment to allow the build to report success (with non-required - ## sub-builds continuing to run) if all required sub-builds have - ## succeeded. This is somewhat buggy currently: it can cause - ## duplicate notifications and prematurely report success if a - ## single sub-build has succeeded. See - ## https://github.com/travis-ci/travis-ci/issues/1696 - # fast_finish: true + ## Allow the build to report success (with non-required sub-builds + ## continuing to run) if all required sub-builds have succeeded. + fast_finish: true ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… - # allow_failures: - # - compiler: gcc - # os: linux + allow_failures: + ## macOS chutney is very slow, so we let the build finish before it's done + ## We'd like to fast finish, but still eventually show failures. + ## But Travis doesn't have that option. + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty diff --git a/changes/ticket30860 b/changes/ticket30860 new file mode 100644 index 000000000..b946f735c --- /dev/null +++ b/changes/ticket30860 @@ -0,0 +1,3 @@ + o Testing: + - Run the chutney IPv6 networks as part of Travis CI. + Closes ticket 30860. diff --git a/changes/ticket31859 b/changes/ticket31859 index 0eb8a42e9..dbc591e00 100644 --- a/changes/ticket31859 +++ b/changes/ticket31859 @@ -1,3 +1,3 @@ o Testing: - - Remove some redundant Travis CI jobs, to speed up CI. + - Simplify the Travis CI build matrix, and optimise for build time. Closes ticket 31859.

1 0

[tor/maint-0.4.1] Merge branch 'bug31859_029' into bug31859_035
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit f368f5bc370d23f2e1888faeeceecb1cea290242 Merge: 02840169d 1e0e23c1e Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:20:16 2019 +1000 Merge branch 'bug31859_029' into bug31859_035 While merging: * leave out some redundant jobs and build matrix entries .travis.yml | 68 ++++++++++++++++++----------------------------------- changes/ticket30860 | 3 +++ changes/ticket31859 | 3 +++ 3 files changed, 29 insertions(+), 45 deletions(-) diff --cc .travis.yml index ef2e41998,564c97dbf..1f555c69c --- a/.travis.yml +++ b/.travis.yml @@@ -30,69 -21,40 +28,49 @@@ env ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: - ## We want to use each build option at least once - ## - ## We don't list default variable values, because we set the defaults - ## in global (or the default is unset) + ## This matrix entry is required, but it doesn't actually create any jobs - - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true matrix: - ## include creates builds with gcc, linux + ## include creates builds with gcc, linux, unless we override those defaults include: - ## We include a single coverage build with the best options for coverage - - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" - ## We only want to check these build option combinations once - ## (they shouldn't vary by compiler or OS) - ## We run rust and coverage with hardening off, which seems like enough - # - env: HARDENING_OPTIONS="" + ## We run basic tests on macOS + - compiler: clang + os: osx + ## 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 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 also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" -- compiler: clang + ## 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 + # We clone our stem repo and run `make test-stem` + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" + ## Check rust online with distcheck, to make sure we remove rust products + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + ## Check disable module dirauth with and without rust + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: MODULES_OPTIONS="--disable-module-dirauth" + ## Check NSS + - env: NSS_OPTIONS="--enable-nss" - ## Uncomment to allow the build to report success (with non-required - ## sub-builds continuing to run) if all required sub-builds have - ## succeeded. This is somewhat buggy currently: it can cause - ## duplicate notifications and prematurely report success if a - ## single sub-build has succeeded. See - ## https://github.com/travis-ci/travis-ci/issues/1696 - # fast_finish: true + ## Allow the build to report success (with non-required sub-builds + ## continuing to run) if all required sub-builds have succeeded. + fast_finish: true - ## Careful! We use global envs, which makes it hard to exclude or - ## allow failures by env: + ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… allow_failures: + ## macOS chutney is very slow, so we let the build finish before it's done + ## We'd like to fast finish, but still eventually show failures. + ## But Travis doesn't have that option. + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - exclude: - ## gcc on OSX is less useful, because the default compiler is clang. - - compiler: gcc - os: osx - ## gcc on Linux with no env is redundant, because all the custom builds use - ## gcc on Linux - - compiler: gcc - os: linux - env: - ## offline rust builds for gcc on Linux are redundant, because we do an - ## online rust build for gcc on Linux - - compiler: gcc - os: linux - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0

[tor/maint-0.4.1] Travis: Split jobs, add essential jobs, remove redundant jobs
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 4482d6fde5b0b8a0261dd31889a23b789844a486 Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:28:26 2019 +1000 Travis: Split jobs, add essential jobs, remove redundant jobs Part of 31859 for 0.3.5. --- .travis.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f555c69c..670b0536f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,15 @@ matrix: ## We run chutney on macOS, because macOS Travis has IPv6 - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx - # We clone our stem repo and run `make test-stem` + ## We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - ## Check rust online with distcheck, to make sure we remove rust products - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - ## Check disable module dirauth with and without rust - - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" - ## Check NSS + ## 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 + ## We check NSS - env: NSS_OPTIONS="--enable-nss" ## Allow the build to report success (with non-required sub-builds

1 0

[tor/maint-0.4.1] Travis: Remove a redundant clang Linux job
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 4e4297830ec04da32dda1b9424847f4710cc202e Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:39:46 2019 +1000 Travis: Remove a redundant clang Linux job Part of 31859. --- .travis.yml | 2 -- changes/ticket31859 | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b18335d74..f47fe8bb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,8 +27,6 @@ env: matrix: ## include creates builds with gcc, linux, unless we override those defaults include: - ## gcc is the default compiler for most jobs, so we want a clang Linux job - - compiler: clang ## clang is the default macOS compiler, so we use it for the macOS job - compiler: clang os: osx diff --git a/changes/ticket31859 b/changes/ticket31859 new file mode 100644 index 000000000..0eb8a42e9 --- /dev/null +++ b/changes/ticket31859 @@ -0,0 +1,3 @@ + o Testing: + - Remove some redundant Travis CI jobs, to speed up CI. + Closes ticket 31859.

1 0

[tor/maint-0.4.1] Travis: Unroll the build matrix into matrix: include:
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 8520071f2313ae6973082ca7cb5680a9df88ce78 Author: teor <teor(a)torproject.org> Date: Thu Sep 26 17:25:17 2019 +1000 Travis: Unroll the build matrix into matrix: include: The jobs should be the same, but Travis may display them differently. Part of 31859. --- .travis.yml | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2bc6395d..b18335d74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,12 @@ cache: compiler: - gcc - - clang os: - linux - - osx -## The build matrix in the following stanza expands into builds for each -## OS and compiler. +## We don't use the build matrix cross-product, because it makes too many jobs +## Instead, we list each job under matrix: include: env: global: ## The Travis CI environment allows us two cores, so let's use both. @@ -23,15 +21,17 @@ env: ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: - ## We want to use each build option at least once - ## - ## We don't list default variable values, because we set the defaults - ## in global (or the default is unset) + ## This matrix entry is required, but it doesn't actually create any jobs - matrix: - ## include creates builds with gcc, linux + ## include creates builds with gcc, linux, unless we override those defaults include: + ## gcc is the default compiler for most jobs, so we want a clang Linux job + - compiler: clang + ## clang is the default macOS compiler, so we use it for the macOS job + - compiler: clang + os: osx ## We include a single coverage build with the best options for coverage - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" ## We only want to check these build option combinations once @@ -52,18 +52,11 @@ matrix: ## https://github.com/travis-ci/travis-ci/issues/1696 # fast_finish: true - ## Careful! We use global envs, which makes it hard to exclude or - ## allow failures by env: + ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… - exclude: - ## gcc on OSX is less useful, because the default compiler is clang. - - compiler: gcc - os: osx - ## gcc on Linux with no env is redundant, because all the custom builds use - ## gcc on Linux - - compiler: gcc - os: linux - env: + # allow_failures: + # - compiler: gcc + # os: linux ## (Linux only) Use the latest Linux image (Ubuntu Trusty) dist: trusty

1 0

[tor/maint-0.4.1] Merge branch 'bug31859_035' into bug31859_040
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 07db4141abb228bc6848e520b6faa75b0015af72 Merge: 9e674d0eb 632e70739 Author: teor <teor(a)torproject.org> Date: Tue Oct 1 23:46:28 2019 +1000 Merge branch 'bug31859_035' into bug31859_040 .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)

1 0

[tor/maint-0.4.1] Travis: Keep the macOS Rust job, but don't wait for it to finish
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 632e707397ce95632f4c059a0d285870624eaa33 Author: teor <teor(a)torproject.org> Date: Tue Oct 1 17:32:46 2019 +1000 Travis: Keep the macOS Rust job, but don't wait for it to finish Since Rust on macOS is slow, don't wait for the macOS Rust job to finish. Instead, split rust into slow rust (macOS) and fast rust (Linux). And allow the build to finish before slow rust finishes. Also make sure that we have: * a Rust build on each platform, * a Rust build with each compiler, and * a check on all our Rust builds. Finally, sort builds: allow fail last, macOS first, slowest first. Closes 31859 for 0.3.5. --- .travis.yml | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 670b0536f..65088d556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,25 +37,30 @@ 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 check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" 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 chutney on macOS, because macOS Travis has IPv6 - - 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" + ## 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 + - 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 os: osx - ## We check NSS - - env: NSS_OPTIONS="--enable-nss" + ## We run chutney on macOS, because macOS Travis has IPv6 + - 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. @@ -64,9 +69,12 @@ matrix: ## Careful! We use global envs, which makes it hard to allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… allow_failures: - ## macOS chutney is very slow, so we let the build finish before it's done - ## We'd like to fast finish, but still eventually show failures. - ## But Travis doesn't have that option. + ## macOS rust and chutney are very slow, so we let the build finish before + ## they are done. We'd like to fast finish, but still eventually show + ## any failures in the build status. But Travis doesn't have that ability. + - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + compiler: clang + os: osx - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx ## test-stem sometimes hangs on Travis

1 0

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

17 Oct '19

commit 4b8e5ea0dce85bb96ce92f171246aa101feda4ac Merge: 702aa8f77 c660f4796 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:51:50 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5

1 0

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

17 Oct '19

commit 400e31ad1937aeaa962349eef058945080c46daa Merge: 13daf339a e483257e1 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:52:06 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0