September 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket27252-032' into ticket27252-033
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit ae2085dd7be279b0fc3ff9c582d35a498c63350a Merge: 8691046ac 92f1a8af8 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:18:50 2018 +1000 Merge branch 'ticket27252-032' into ticket27252-033 Semantic merge: - Rust offline and online were swapped in ticket27252-032 - TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 .travis.yml | 23 +++++++++++++++++++---- changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --cc .travis.yml index 09bd04505,bbf0b575b..bf0152384 --- a/.travis.yml +++ b/.travis.yml @@@ -37,7 -37,7 +37,8 @@@ env ## and it's going to take a while for them to be fixed. See: ## https:/trac.torproject.org/projects/tor/ticket/25386 ## https:/trac.torproject.org/projects/tor/ticket/26398 - - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" - - RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS="" ++ ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 ++ - RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" matrix: ## include creates builds with gcc, linux, sudo: false @@@ -50,9 -50,10 +51,9 @@@ # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" - ## Check rust offline with distcheck, to make sure we remove rust products - ## Check rust online without hardening (see above), and without distcheck - ## Distcheck doesn't work with rust in 0.3.2 - ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" ++ ## Check rust online with distcheck, to make sure we remove rust products + ## But without hardening (see above) - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" ++ - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@@ -69,9 -70,23 +70,23 @@@ ## Clang doesn't work in containerized builds, see below. - compiler: clang sudo: false - ## We also exclude non-containerized gcc, because they're slow and redundant. + ## Non-containerized gcc are slow and redundant. - compiler: gcc sudo: required + ## 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" RUST_DEPENDENCIES=true HARDENING_OPTIONS="" ++ env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" ## We don't need sudo. (The "apt:" stanza after this allows us to not need ## sudo; otherwise, we would need it for getting dependencies.)

1 0

[tor/master] Merge branch 'ticket27252-033' into ticket27252-034
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit e8dd83aecb6faaca81e7c808010ae08c2ac574c9 Merge: 573b6e4f2 ae2085dd7 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:20:17 2018 +1000 Merge branch 'ticket27252-033' into ticket27252-034 Semantic merge: - Rust offline and online were swapped in ticket27252-032 .travis.yml | 23 +++++++++++++++++++---- changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --cc .travis.yml index 7db757785,bf0152384..7cc8086b9 --- a/.travis.yml +++ b/.travis.yml @@@ -50,12 -51,9 +51,12 @@@ matrix # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" - ## Check rust offline with distcheck, to make sure we remove rust products + ## Check rust online with distcheck, to make sure we remove rust products ## But without hardening (see above) - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" + ## Check disable module dirauth with rust, and without rust but with distcheck + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: DISTCHECK="yes" MODULES_OPTIONS="--disable-module-dirauth" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have

1 0

[tor/master] Travis: Skip offline rust builds for Linux gcc
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 92f1a8af836933a3488e32bb03f859d5548883d7 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 17:24:38 2018 +1000 Travis: Skip offline rust builds for Linux gcc We already do an online rust build for Linux gcc. Part of 27252. --- .travis.yml | 6 ++++++ changes/ticket27252-032 | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 578a671d9..bbf0b575b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,6 +81,12 @@ matrix: - 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" RUST_DEPENDENCIES=true HARDENING_OPTIONS="" ## We don't need sudo. (The "apt:" stanza after this allows us to not need ## sudo; otherwise, we would need it for getting dependencies.) diff --git a/changes/ticket27252-032 b/changes/ticket27252-032 index 5761f04d6..4752aedcf 100644 --- a/changes/ticket27252-032 +++ b/changes/ticket27252-032 @@ -1,3 +1,5 @@ o Minor features (continuous integration): - Only run one online rust build in Travis, to reduce network errors. + Skip offline rust builds on Travis for Linux gcc, because they're + redundant. Implements ticket 27252.

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 8e714d2a025618a7618b3b756e5ef96dea7496b8 Merge: 8afc100cb ae2085dd7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:09:09 2018 -0400 Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3 .travis.yml | 23 +++++++++++++++++++---- changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ 3 files changed, 30 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 46bccc50e53b1adde2065ad3ccf6ff538674c630 Merge: 8a873a569 da17875ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:09:18 2018 -0400 Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4 .travis.yml | 27 +++++++++++++++++++++------ changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ changes/ticket27252-034 | 3 +++ 4 files changed, 35 insertions(+), 6 deletions(-)

1 0

[tor/master] Travis: Don't do a distcheck with --disable-module-dirauth
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit da17875ea5cf206e406c58991b455c9d2fb7d478 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 17:43:03 2018 +1000 Travis: Don't do a distcheck with --disable-module-dirauth Part of 27252. --- .travis.yml | 4 ++-- changes/ticket27252-034 | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7cc8086b9..930e2df91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,9 +54,9 @@ matrix: ## Check rust online with distcheck, to make sure we remove rust products ## But without hardening (see above) - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" - ## Check disable module dirauth with rust, and without rust but with distcheck + ## Check disable module dirauth with and without rust - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" - - env: DISTCHECK="yes" MODULES_OPTIONS="--disable-module-dirauth" + - env: MODULES_OPTIONS="--disable-module-dirauth" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have diff --git a/changes/ticket27252-034 b/changes/ticket27252-034 new file mode 100644 index 000000000..620ad83ef --- /dev/null +++ b/changes/ticket27252-034 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Don't do a distcheck with --disable-module-dirauth in Travis. + Implements ticket 27252.

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit c3a750486c8d156ffb5dff6c4d773dd61d6cb46c Merge: 3119cb506 92f1a8af8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:09:04 2018 -0400 Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2 .travis.yml | 22 ++++++++++++++++++---- changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ 3 files changed, 29 insertions(+), 4 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 198b6354e6c58ab4276461b5215487b8e9c15683 Merge: 19429fac2 7cea5a287 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:08:57 2018 -0400 Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9 .travis.yml | 13 +++++++++++-- changes/ticket27252 | 6 ++++++ 2 files changed, 17 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 89c5b8d7dc4b22a3c91241a6e91edc41c2c6b362 Merge: 46bccc50e 1d8957129 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 1d8957129b51826b41f8f9efb7b13c4506222bf5 Merge: 8e714d2a0 5a8827a4c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3

1 0