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

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

17 Oct '19

commit 58746ad9ca4599fa40d6709228f79fbafaeb4976 Merge: 53116ca0b e5dda7f66 Author: teor <teor(a)torproject.org> Date: Wed Oct 2 00:20:38 2019 +1000 Merge branch 'bug31859_041' into bug31859_master Merge master's RUST_VERSION="nightly" into the macOS Rust job from bug31859_041. Drop master's RUST_VERSION="beta", because we only have two Rust jobs now. .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-) diff --cc .travis.yml index 94d9bf9cc,909a3d28d..ec3827d31 --- a/.travis.yml +++ b/.travis.yml @@@ -29,53 -27,56 +27,58 @@@ env - HARDENING_OPTIONS="--enable-expensive-hardening" ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" + ## Our default rust version is the minimum supported version + - RUST_VERSION="1.31.0" 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 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="" TOR_TEST_RNG_SEED="636f766572616765" - ## 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 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 also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" + ## 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" ++ - env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang - # We clone our stem repo and run `make test-stem` + 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 + ## 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_VERSION="beta" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - ## Check disable module dirauth with and without rust - - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_VERSION="nightly" 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 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 - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"

1 0

[tor/maint-0.4.2] 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.2] Merge branch 'bug31859_040' into bug31859_041
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit e5dda7f66477dad699c654c54978bbad9a999847 Merge: 6f3f93d86 07db4141a Author: teor <teor(a)torproject.org> Date: Tue Oct 1 23:50:24 2019 +1000 Merge branch 'bug31859_040' into bug31859_041 Merge TOR_TEST_RNG_SEED in maint-0.4.1 into the coverage line from bug31859_040. .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-) diff --cc .travis.yml index bbba0e204,b3b8cb977..909a3d28d --- a/.travis.yml +++ b/.travis.yml @@@ -30,50 -28,55 +28,55 @@@ 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 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="" + - env: COVERAGE_OPTIONS="--enable-coverage" HARDENING_OPTIONS="" TOR_TEST_RNG_SEED="636f766572616765" - ## 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 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 also try running a hardened clang build with chutney on Linux. - - env: CHUTNEY="yes" SKIP_MAKE_CHECK="yes" CHUTNEY_ALLOW_FAILURES="2" + ## 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 clone our stem repo and run `make test-stem` + 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 + ## 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 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 - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 702aa8f775591942f276286ab285fcb8fe80d32f Merge: 7b9cb4c47 632e70739 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:50:28 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5 .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)

1 0

[tor/maint-0.4.2] Travis: Allow the build to finish before the macOS Rust job
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit b0bf7e7b606e45cff5988106febe157009c2f561 Author: teor <teor(a)torproject.org> Date: Wed Oct 2 10:09:02 2019 +1000 Travis: Allow the build to finish before the macOS Rust job When we merged TOR_RUST_VERSION from master, the allow_failures rule did not match any more. Update it to make it match. Closes 31859 for master. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ec3827d31..00c967e34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ matrix: ## 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" + - env: RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" compiler: clang os: osx - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes"

1 0

[tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 13daf339a903da74051ac9d51d8bb5b386be64f8 Merge: 4dcbbe416 e5dda7f66 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:51:02 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1 .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)

1 0

[tor/maint-0.4.2] 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.2] Merge branch 'maint-0.4.1' into maint-0.4.2
by teor＠torproject.org 17 Oct '19

17 Oct '19

commit 8ac9af2330e99032445055d6728e9b3fe34a3470 Merge: 92c4dc9b1 400e31ad1 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:52:15 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

[tor/maint-0.4.2] 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

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

17 Oct '19

commit 92c4dc9b141e4e2e71b68c40c85ef64f20c8344b Merge: a4790e7d4 b0bf7e7b6 Author: teor <teor(a)torproject.org> Date: Thu Oct 17 14:51:30 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2 .travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-) diff --cc .travis.yml index 2073b853c,00c967e34..c65923d2c --- a/.travis.yml +++ b/.travis.yml @@@ -15,17 -15,13 +15,15 @@@ compiler 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. - - MAKEFLAGS="-j 2" + ## The Travis CI environment allows us two cores, so let's use both. Also, + ## let's use the "-k" flag so that we get all of the compilation failures, + ## not just the first one. + - MAKEFLAGS="-k -j 2" ## We turn on hardening by default ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later - HARDENING_OPTIONS="--enable-expensive-hardening"

1 0