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

[tor/release-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 Merge: c4d0d9bd2 4517c4c3e Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:43:17 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 Replace 033 .travis.yml with 032 .travis.yml. Subsequent commits will restore 033 functionality. src/rust/tor_util/include.am is deleted in 033. Subsequent commits will apply 032 changes to src/rust/tor_rust/include.am. Replace 033 src/test/test_rust.sh with 032 src/test/test_rust.sh, which was backported from master. .travis.yml | 260 ++++++++++++++++++++++++++------------------- changes/bug26497 | 3 + changes/bug26497-backport | 3 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/test/test_rust.sh | 6 +- 11 files changed, 179 insertions(+), 116 deletions(-)

1 0

[tor/release-0.3.3] Travis: Improve Rust comments
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 169afe3ca52fc8b201f00fe8b262c75e79a199d5 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 16:30:21 2018 +1000 Travis: Improve Rust comments --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c2c9e3d6..9f1bc70e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,8 @@ matrix: # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - env: ASCIIDOC_OPTIONS="" DISTCHECK="yes" - ## Check rust offline without distcheck (see above) + ## Check rust offline without hardening (see above), or 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=""

1 0

[tor/release-0.3.3] Travis: put distcheck first for readability
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit f4f2e43f5dfa6da163ec89ab67baa4f2f13b3197 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 12:33:51 2018 +1000 Travis: put distcheck first for readability --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc39f661b..7583eb749 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ matrix: ## (they shouldn't vary by compiler or OS) - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - - env: ASCIIDOC_OPTIONS="" DISTCHECK="yes" + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" ## 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/release-0.3.3] Changes file for Travis: enable macOS builds
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 4cd3fcf2481868a693c31957fe0d61d69bf1312b Author: teor <teor(a)torproject.org> Date: Fri Aug 10 12:10:56 2018 +1000 Changes file for Travis: enable macOS builds --- changes/ticket24629 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket24629 b/changes/ticket24629 new file mode 100644 index 000000000..482c0a1a6 --- /dev/null +++ b/changes/ticket24629 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Enable macOS builds in our Travis CI configuration. + Closes ticket 24629.

1 0

[tor/release-0.3.3] Travis: add a missing macOS asciidoc dependency
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit e78f9c5dfb55e71fa79c152d13a1ff72fd907040 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 16:24:31 2018 +1000 Travis: add a missing macOS asciidoc dependency --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7583eb749..eed137181 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,6 +124,7 @@ install: - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ## If we're on OSX, and using asciidoc, install asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi + - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/release-0.3.3] Merge branch 'travis-osx-029' into travis-osx-032
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 69adc68ac6031246f9c5a723755c87d6abf34fc6 Merge: 169afe3ca e78f9c5df Author: teor <teor(a)torproject.org> Date: Fri Aug 10 16:31:35 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Simple merge to resolve order conflicts. .travis.yml | 3 ++- changes/ticket24629 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc .travis.yml index 9f1bc70e8,eed137181..f92a3d8d4 --- a/.travis.yml +++ b/.travis.yml @@@ -46,14 -36,9 +46,14 @@@ 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 rust and coverage with hardening off, which seems like enough + # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - - env: ASCIIDOC_OPTIONS="" DISTCHECK="yes" + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + ## Check rust offline without hardening (see above), or 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="" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@@ -146,13 -124,7 +146,14 @@@ install - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ## If we're on OSX, and using asciidoc, install asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi + - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + ## If we're using Rust, download rustup + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi + ## If we're testing rust builds in offline-mode, then set up our vendored dependencies + - if [[ "$RUST_DEPENDENCIES" == "true" ]]; then export RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/release-0.3.3] Merge branch 'travis-osx-029' into travis-osx-032
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7 Merge: 69adc68ac d514e9866 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 19:05:49 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Merge asciidoc from 029 with rust from 032. .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --cc .travis.yml index f92a3d8d4,8b8621007..1b43c721a --- a/.travis.yml +++ b/.travis.yml @@@ -147,13 -125,7 +147,14 @@@ install ## If we're on OSX, and using asciidoc, install asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi + ## If we're using Rust, download rustup + - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain stable; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi + ## If we're testing rust builds in offline-mode, then set up our vendored dependencies + - if [[ "$RUST_DEPENDENCIES" == "true" ]]; then export RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/release-0.3.3] Travis: add a missing macOS asciidoc env var
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit d514e98663fbac3107d02f492fbff9d6018c275d Author: teor <teor(a)torproject.org> Date: Fri Aug 10 18:26:33 2018 +1000 Travis: add a missing macOS asciidoc env var --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eed137181..8b8621007 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,6 +125,7 @@ install: ## If we're on OSX, and using asciidoc, install asciidoc - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install asciidoc; fi - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xmlto; fi + - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi ## ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi

1 0

[tor/release-0.3.3] Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 546c134801a17ebb63032b5ac52a65279998ea6f Author: teor <teor(a)torproject.org> Date: Fri Aug 10 13:11:27 2018 +1000 Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4 Re-applies 0.3.3 changes after 24629. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4afc84285..5405af436 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then cd "${abs_top_builddir:-../../..}/src/rust" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ - "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

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

22 Aug '18

commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2

1 0