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

[tor/maint-0.4.0] changes: file for 32629
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit a277f28947900fc2018f634078bf59eae166c75a Author: teor <teor(a)torproject.org> Date: Fri Dec 6 10:51:05 2019 +1000 changes: file for 32629 --- changes/ticket32629 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 000000000..740746c57 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629.

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 7dd59460941c50242e740ff0cbd84b588d66e26e Merge: b7b467d3a b84e7715d Author: teor <teor(a)torproject.org> Date: Mon Dec 16 08:13:38 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9 .travis.yml | 5 ++--- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 748117298341de8a279f4437b6d557f0d50edb63 Merge: b9504f788 1cd20ff84 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 08:16:04 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.5
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 1cd20ff848eab6ee7b441c5aab0578ab02a114bc Merge: 05908d57f 7dd594609 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 08:15:55 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.5

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 05908d57f64a4365f6715f19aba51ccd5849e635 Merge: 0c4f0ec97 a277f2894 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 08:14:04 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5 .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.4.0] Revert "Travis: Disable all but one macOS build"
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 99b5f1b261a3b8535e8e9b8ca8ca23303c2aea2d Author: teor <teor(a)torproject.org> Date: Thu Nov 28 12:10:10 2019 +1000 Revert "Travis: Disable all but one macOS build" This reverts commit 511aeba8eeb24a953228e00917f64703059a7673. --- .travis.yml | 5 ++--- changes/ticket32177 | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4ea9400b8..aad0c3c3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,9 +45,8 @@ matrix: ## 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 - # Disabled due to slow Travis macOS builds, see #32177 - #- env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" - # os: osx + - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" + os: osx ## Allow the build to report success (with non-required sub-builds ## continuing to run) if all required sub-builds have succeeded. diff --git a/changes/ticket32177 b/changes/ticket32177 deleted file mode 100644 index 6d6816acd..000000000 --- a/changes/ticket32177 +++ /dev/null @@ -1,3 +0,0 @@ - o Testing: - - Disable all but one Travis CI macOS build, to mitigate slow scheduling - of Travis macOS jobs. Closes ticket 32177.

1 0

[tor/maint-0.4.0] Revert "Travis: Disable the Rust macOS build"
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 453e092e521626420fb679ad99fade0dd1c9af88 Author: teor <teor(a)torproject.org> Date: Thu Nov 28 12:11:37 2019 +1000 Revert "Travis: Disable the Rust macOS build" This reverts commit 4c4a0d50ff4fd01862b78e8cbfaabfa9e4d4ae12. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f0e78587..35c3502e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,10 +63,9 @@ matrix: ## 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 + - 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"

1 0

[tor/maint-0.3.5] changes: file for 32629
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit b84e7715daba5bdcb20fa3f1148d2c518ea5704c Author: teor <teor(a)torproject.org> Date: Fri Dec 6 10:51:05 2019 +1000 changes: file for 32629 --- changes/ticket32629 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket32629 b/changes/ticket32629 new file mode 100644 index 000000000..740746c57 --- /dev/null +++ b/changes/ticket32629 @@ -0,0 +1,4 @@ + o Testing: + - Re-enable the Travis CI macOS Chutney build, but allow the job to finish + before it finishes, because the Travis macOS jobs are slow. + Closes ticket 32629.

1 0

[tor/maint-0.3.5] Merge branch 'ticket32629_029' into ticket32629_035
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit f2f7491cd9ea8a8c39b576106b44488202aa3c63 Merge: 453e092e5 99b5f1b26 Author: teor <teor(a)torproject.org> Date: Thu Nov 28 12:21:08 2019 +1000 Merge branch 'ticket32629_029' into ticket32629_035 Merge re-enable chutney from ticket32629_029 with stem from maint-0.3.5. .travis.yml | 5 ++--- changes/ticket32177 | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --cc .travis.yml index 35c3502e8,aad0c3c3e..21c86ad93 --- a/.travis.yml +++ b/.travis.yml @@@ -55,23 -44,9 +55,22 @@@ matrix 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 + - 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" - # os: osx + - 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.

1 0

[tor/maint-0.3.5] Revert "Travis: Disable the Rust macOS build"
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 453e092e521626420fb679ad99fade0dd1c9af88 Author: teor <teor(a)torproject.org> Date: Thu Nov 28 12:11:37 2019 +1000 Revert "Travis: Disable the Rust macOS build" This reverts commit 4c4a0d50ff4fd01862b78e8cbfaabfa9e4d4ae12. --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7f0e78587..35c3502e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,10 +63,9 @@ matrix: ## 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 + - 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"

1 0