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

[tor/release-0.3.3] 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

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

11 Sep '18

commit 95f06d61d09b81039ee44ec7329e9d37fdc75ba0 Merge: 7df92c0e0 1d8957129 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 23 +++++++++++++++++++---- changes/ticket27252 | 6 ++++++ changes/ticket27252-032 | 5 +++++ 3 files changed, 30 insertions(+), 4 deletions(-)

1 0

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

11 Sep '18

commit 5a8827a4c98a354c775060f6c85c05a97c56e9b4 Merge: c3a750486 198b6354e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:09:21 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2

1 0

[tor/release-0.3.4] Travis: skip gcc on OSX, because the default compiler is clang
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 8f89fb8f398c365588d456625c77cdaee97c77bd Author: teor <teor(a)torproject.org> Date: Thu Aug 23 17:00:42 2018 +1000 Travis: skip gcc on OSX, because the default compiler is clang Part of #27252. --- .travis.yml | 3 +++ changes/ticket27252 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8b8621007..102b50030 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,9 @@ matrix: ## We also exclude non-containerized gcc, because they're slow and redundant. - compiler: gcc sudo: required + ## And skip gcc on OSX, because the default compiler is clang + - compiler: gcc + os: osx ## 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 b/changes/ticket27252 new file mode 100644 index 000000000..f0855db1d --- /dev/null +++ b/changes/ticket27252 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Skip gcc on OSX in Travis CI, it's rarely used. + Implements ticket 27252.

1 0

[tor/release-0.3.4] Travis: make the exclude descriptions shorter
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 9f81e03262ef3ba6491eaf14a93ec9c6e7bf5b45 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:12:36 2018 +1000 Travis: make the exclude descriptions shorter Part of 27252. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74a248fda..68534604a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,10 +56,10 @@ matrix: ## 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 - ## And skip gcc on OSX, because the default compiler is clang + ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx

1 0

[tor/release-0.3.4] Travis: Skip a duplicate hardening-off build in Tor 0.2.9
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 7ec84cc0942af27136d27e6a9085e02b07c61da1 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 17:06:53 2018 +1000 Travis: Skip a duplicate hardening-off build in Tor 0.2.9 Part of 27252. --- .travis.yml | 3 ++- changes/ticket27252 | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 102b50030..74a248fda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,8 @@ matrix: - 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) - - env: HARDENING_OPTIONS="" + ## We run coverage with hardening off, which seems like enough + # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" diff --git a/changes/ticket27252 b/changes/ticket27252 index f0855db1d..2ee4c8217 100644 --- a/changes/ticket27252 +++ b/changes/ticket27252 @@ -1,3 +1,4 @@ o Minor features (continuous integration): - Skip gcc on OSX in Travis CI, it's rarely used. + Skip a duplicate hardening-off build in Travis on Tor 0.2.9. Implements ticket 27252.

1 0

[tor/release-0.3.4] Travis: Skip gcc on Linux with default settings
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit 7cea5a287fbf0ed1b9ed92e144ff450c4f93f382 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:13:53 2018 +1000 Travis: Skip gcc on Linux with default settings It's redundant, because all the non-default builds use gcc on Linux. Part of 27252. --- .travis.yml | 5 +++++ changes/ticket27252 | 2 ++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 68534604a..1e7e2fe2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,6 +62,11 @@ matrix: ## 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: ## 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 b/changes/ticket27252 index 2ee4c8217..410ddef8c 100644 --- a/changes/ticket27252 +++ b/changes/ticket27252 @@ -1,4 +1,6 @@ o Minor features (continuous integration): - Skip gcc on OSX in Travis CI, it's rarely used. Skip a duplicate hardening-off build in Travis on Tor 0.2.9. + Skip gcc on Linux with default settings, because all the non-default + builds use gcc on Linux. Implements ticket 27252.

1 0

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

11 Sep '18

commit 99a2ecc79562dc340f73f998e5c441f3a7968e1a Merge: c1ad40627 7cea5a287 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:15:55 2018 +1000 Merge branch 'ticket27252-029' into ticket27252-032 This commit is already implemented in 0.3.2 and later: - Travis: Skip a duplicate hardening-off build in Tor 0.2.9 .travis.yml | 10 +++++++++- changes/ticket27252 | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Travis: Only run one online rust build, to reduce network errors
by nickm＠torproject.org 11 Sep '18

11 Sep '18

commit b61d40c8a24ccbd5a08038f9d4d2d38cf987c400 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 17:23:38 2018 +1000 Travis: Only run one online rust build, to reduce network errors Part of 27252. --- .travis.yml | 6 +++--- changes/ticket27252-032 | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74b9d98da..578a671d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ 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="" matrix: ## include creates builds with gcc, linux, sudo: false @@ -50,10 +50,10 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" - ## Check rust offline without hardening (see above), or distcheck + ## 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" RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + - env: 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 diff --git a/changes/ticket27252-032 b/changes/ticket27252-032 new file mode 100644 index 000000000..5761f04d6 --- /dev/null +++ b/changes/ticket27252-032 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Only run one online rust build in Travis, to reduce network errors. + Implements ticket 27252.

1 0

[tor/release-0.3.4] 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