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

[tor/maint-0.3.4] 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/maint-0.3.4] Merge branch 'travis-osx-032' into travis-osx-033
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit ed1210d0f11d21ce97823f88bf20d3659a8927cf Merge: 546c13480 69adc68ac Author: teor <teor(a)torproject.org> Date: Fri Aug 10 16:38:13 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 Preserve 033 changes since 032. .travis.yml | 3 ++- changes/ticket24629 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc .travis.yml index 3d86fdc1b,f92a3d8d4..bfb3e7b51 --- a/.travis.yml +++ b/.travis.yml @@@ -49,10 -49,11 +49,10 @@@ matrix ## 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="" + ## Check rust offline 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="" ## 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/maint-0.3.4] 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/maint-0.3.4] Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit a544af818671eae8f265c687e24349061d3b8450 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:55:50 2018 +1000 Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later TOR_RUST_DEPENDENCIES used to be spelt RUST_DEPENDENCIES in 0.3.2. Re-applies 0.3.3 changes after 24629. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c2c9e3d6..e59995062 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,8 +51,7 @@ matrix: ## We check asciidoc with distcheck, to make sure we remove doc products - env: ASCIIDOC_OPTIONS="" DISTCHECK="yes" ## Check rust offline without distcheck (see above) - ## 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="" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -151,7 +150,7 @@ install: - 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 + - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_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/maint-0.3.4] Travis: Check Rust with distcheck in 0.3.3 and later
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit f5aa667d48d88f917371219ddefce26637c2b1ad Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:59:42 2018 +1000 Travis: Check Rust with distcheck in 0.3.3 and later Backports an 0.3.4 change that also works in 0.3.3. Part of 24629. --- .travis.yml | 5 +++-- changes/ticket24629-backport | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e59995062..3d86fdc1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,8 +50,9 @@ 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) - - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" + ## Check rust offline 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="" ## 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/ticket24629-backport b/changes/ticket24629-backport new file mode 100644 index 000000000..dfbc46563 --- /dev/null +++ b/changes/ticket24629-backport @@ -0,0 +1,3 @@ + o Minor features (continuous integration): + - Backport Travis rust distcheck to 0.3.3. + Closes ticket 24629.

1 0

[tor/maint-0.3.4] 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/maint-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit a1c110a2a478d3fae50871741d52659cc34f4623 Merge: 2a33edc59 ed1210d0f Author: teor <teor(a)torproject.org> Date: Fri Aug 10 16:41:27 2018 +1000 Merge branch 'travis-osx-033' into travis-osx-034 Take the asciidoc changes from 033, and the module changes from 034. .travis.yml | 1 + 1 file changed, 1 insertion(+)

1 0

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

22 Aug '18

commit 6463cdea55bbeb711a10153156a4b93f2471d034 Merge: ed1210d0f e2eec40c4 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 19:06:32 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 .travis.yml | 1 + 1 file changed, 1 insertion(+)

1 0

[tor/maint-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit c28da0d8e105515bafdb8a9710ab965a51b3c4eb Merge: a1c110a2a 6463cdea5 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 19:06:45 2018 +1000 Merge branch 'travis-osx-033' into travis-osx-034 .travis.yml | 1 + 1 file changed, 1 insertion(+)

1 0

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