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

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

25 Oct '19

commit 8f8e1523e0cdf00570edcaa51f4c8564f263202e Merge: 446912854 d7c40beea Author: teor <teor(a)torproject.org> Date: Fri Oct 25 10:56:17 2019 +1000 Merge branch 'maint-0.4.2' into release-0.4.2 .travis.yml | 12 ++++++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.2] changes: file for 31919's bionic Travis image change
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 93be7275ecb5bb3c3e2964bb5179f26e926d7f10 Author: teor <teor(a)torproject.org> Date: Fri Oct 25 09:53:11 2019 +1000 changes: file for 31919's bionic Travis image change --- changes/ticket31919_bionic | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket31919_bionic b/changes/ticket31919_bionic new file mode 100644 index 000000000..eb4164455 --- /dev/null +++ b/changes/ticket31919_bionic @@ -0,0 +1,5 @@ + o Minor features (continuous integration): + - Use Ubuntu Bionic images for our Travis CI builds, so we can get + a recent version of coccinelle. But leave chutney on Ubuntu Trusty, + until we can fix some Bionic permissions issues (see ticket 32240). + Related to ticket 31919.

1 0

[tor/release-0.4.2] Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 1eb57b20b943caa4ee0a5aaefcd8c732eee950b3 Merge: d175e7081 8e549dd56 Author: teor <teor(a)torproject.org> Date: Fri Oct 25 09:48:14 2019 +1000 Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035 .travis.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --cc .travis.yml index 8f7e8e4be,1bb401690..4ded5e25a --- a/.travis.yml +++ b/.travis.yml @@@ -39,26 -32,18 +39,34 @@@ 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" + ## (Linux only) Use an older Linux image (Ubuntu Trusty) + ## The Xenial and Bionic images cause permissions issues for chutney, + ## this is a workaround, until we fix #32240. + dist: trusty + ## 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" + compiler: clang ## 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 + - 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 + # 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" @@@ -73,19 -56,14 +81,19 @@@ ## 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 + - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" - ## (Linux only) Use the latest Linux image (Ubuntu Trusty) - dist: trusty + ## (Linux only) Use a recent Linux image (Ubuntu Bionic) + dist: bionic ## Download our dependencies addons:

1 0

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

25 Oct '19

commit e03db9934a0d26da0b119a2d15d51c4c658af1c8 Merge: 1eb57b20b 93be7275e Author: teor <teor(a)torproject.org> Date: Fri Oct 25 10:55:51 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/ticket31919_bionic | 5 +++++ 1 file changed, 5 insertions(+)

1 0

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

25 Oct '19

commit 4eb55297d38cab682a7ccf0fcb6b15a9b8f85a4b Merge: e188e02f2 63581d55a Author: teor <teor(a)torproject.org> Date: Fri Oct 25 10:56:10 2019 +1000 Merge branch 'maint-0.4.1' into release-0.4.1 .travis.yml | 12 ++++++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.2] Travis: Use Ubuntu Bionic, but keep Trusty for chutney
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 8e549dd5629da8ada48735c36dc97f23b3d192e1 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:31:05 2019 +1000 Travis: Use Ubuntu Bionic, but keep Trusty for chutney Bionic has a recent coccinelle version, which passes our CI tests. But Bionic (and Xenial) cause permissions errors for chutney. We'll fix those in 32240. Part of 31919. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d429e1537..1bb401690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,10 @@ matrix: 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" + ## (Linux only) Use an older Linux image (Ubuntu Trusty) + ## The Xenial and Bionic images cause permissions issues for chutney, + ## this is a workaround, until we fix #32240. + dist: trusty ## 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" @@ -58,8 +62,8 @@ matrix: - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx -## (Linux only) Use the latest Linux image (Ubuntu Trusty) -dist: trusty +## (Linux only) Use a recent Linux image (Ubuntu Bionic) +dist: bionic ## Download our dependencies addons:

1 0

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

25 Oct '19

commit d7c40beeab85198a1081dca60201f5e1f265fe13 Merge: c8aa3cc17 63581d55a Author: teor <teor(a)torproject.org> Date: Fri Oct 25 10:56:13 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2 .travis.yml | 12 ++++++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

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

25 Oct '19

commit e03db9934a0d26da0b119a2d15d51c4c658af1c8 Merge: 1eb57b20b 93be7275e Author: teor <teor(a)torproject.org> Date: Fri Oct 25 10:55:51 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5 changes/ticket31919_bionic | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[tor/maint-0.4.2] Travis: Use Ubuntu Bionic, but keep Trusty for chutney
by teor＠torproject.org 25 Oct '19

25 Oct '19

commit 8e549dd5629da8ada48735c36dc97f23b3d192e1 Author: teor <teor(a)torproject.org> Date: Wed Oct 23 22:31:05 2019 +1000 Travis: Use Ubuntu Bionic, but keep Trusty for chutney Bionic has a recent coccinelle version, which passes our CI tests. But Bionic (and Xenial) cause permissions errors for chutney. We'll fix those in 32240. Part of 31919. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d429e1537..1bb401690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,10 @@ matrix: 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" + ## (Linux only) Use an older Linux image (Ubuntu Trusty) + ## The Xenial and Bionic images cause permissions issues for chutney, + ## this is a workaround, until we fix #32240. + dist: trusty ## 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" @@ -58,8 +62,8 @@ matrix: - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx -## (Linux only) Use the latest Linux image (Ubuntu Trusty) -dist: trusty +## (Linux only) Use a recent Linux image (Ubuntu Bionic) +dist: bionic ## Download our dependencies addons:

1 0

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

25 Oct '19

commit e56e7e865e148c5017ae20df12c76df0f79e60c1 Merge: 57acdaa3f e03db9934 Author: teor <teor(a)torproject.org> Date: Fri Oct 25 10:55:58 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 12 ++++++++++-- changes/ticket31919_bionic | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-)

1 0