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

[tor/release-0.4.2] 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/release-0.4.2] Travis: Disable the macOS Rust job
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit 6558bb4460f360ee16653d9430ee00e969f3adf7 Author: teor <teor(a)torproject.org> Date: Sun Dec 1 20:25:00 2019 +1000 Travis: Disable the macOS Rust job This time, we're disabling it because it's the lowest priority job. (And also slow.) Part of 32629. --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21c86ad93..bdcd94f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,10 +62,13 @@ matrix: - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## We check disable module dirauth - env: MODULES_OPTIONS="--disable-module-dirauth" + ## macOS builds are very slow, and we have a limited number of + ## concurrent macOS jobs. We're not actively developing Rust, so it is + ## the lowest priority. ## 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 + #- env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + # compiler: clang + # 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

1 0

[tor/release-0.4.1] 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/release-0.4.2] 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/release-0.4.1] 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/release-0.4.2] 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/release-0.4.2] changes: file for 32629
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit f86d508d49dd36fede7091635044603741fdd353 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/release-0.4.2] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 15 Dec '19

15 Dec '19

commit ffccf6fc55f691e01ccd3e756486415cbc7ffe8a Merge: 7174a80ed 748117298 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 08:16:12 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 9 +++++---- changes/ticket32177 | 3 --- changes/ticket32629 | 4 ++++ 3 files changed, 9 insertions(+), 7 deletions(-)

1 0

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

15 Dec '19

commit bd11fb10962f5b6e7d51ff5a0e6263ad39d4d184 Merge: 933b0c1b1 ffccf6fc5 Author: teor <teor(a)torproject.org> Date: Mon Dec 16 08:16:20 2019 +1000 Merge branch 'maint-0.4.1' into maint-0.4.2

1 0

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