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

[tor/release-0.3.4] Travis: list installed package versions before building
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit fa9a0cc1fe81bef8584f446829b6fcef258cc762 Author: teor <teor(a)torproject.org> Date: Thu Aug 9 22:16:28 2018 +1000 Travis: list installed package versions before building Part of 24629. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index d822780cd..9671411b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,6 +124,10 @@ 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 + ## + ## Finally, list installed package versions + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi script: - ./autogen.sh

1 0

[tor/release-0.3.4] Travis: add rust cargo offline mode
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit e387eee362fc5c73b7b54c2e887d08816732a0ae Author: teor <teor(a)torproject.org> Date: Thu Aug 9 22:52:51 2018 +1000 Travis: add rust cargo offline mode Backports parts of the 0.3.3 travis config. Part of 24629. --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 43392b3f4..8d300004a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,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) + ## 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 @@ -140,6 +143,8 @@ install: ## 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.4] Travis: fix a typo
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit aee51d9a0e0772d6ad65613f67a63ab8856b7b50 Author: teor <teor(a)torproject.org> Date: Thu Aug 9 22:53:48 2018 +1000 Travis: fix a typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8d300004a..25c31c3d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,7 +112,7 @@ addons: #osx_image: xcode9.4 before_install: - ## If we're on OSX, homebrew usually needs to updated first + ## If we're on OSX, homebrew usually needs to be updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi ## We might be upgrading some useless packages, but that's better than missing an upgrade - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi

1 0

[tor/release-0.3.4] Travis: add lzma and zstd, where available
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit e4d7f2667c6c4660ad9663a39fbdef7d3e2961cd Author: teor <teor(a)torproject.org> Date: Thu Aug 9 19:33:28 2018 +1000 Travis: add lzma and zstd, where available Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Part of 24629, also fixes 27090. --- .travis.yml | 5 +++++ changes/bug27090 | 3 +++ 2 files changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9671411b4..e61c3ba8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,8 +85,11 @@ addons: - zlib1g-dev ## Optional dependencies - libcap-dev + - liblzma-dev - libscrypt-dev - libseccomp-dev + ## zstd doesn't exist in Ubuntu Trusty + #- libzstd ## Conditional dependencies ## Always installed, so we don't need sudo - asciidoc @@ -117,6 +120,8 @@ install: # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi ## If we're on OSX also install the optional dependencies - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zstd; fi ## If we're on OSX, OpenSSL is keg-only, so tor 0.2.9 and later need to be configured --with-openssl-dir= to build - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then OPENSSL_OPTIONS=--with-openssl-dir=`brew --prefix openssl`; fi ## Install conditional features diff --git a/changes/bug27090 b/changes/bug27090 new file mode 100644 index 000000000..3d119a9c3 --- /dev/null +++ b/changes/bug27090 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Build with zstd on macOS. + Fixes bug 27090; bugfix on 0.3.1.5-alpha.

1 0

[tor/release-0.3.4] Fix $abs_top_srcdir in test_rust.sh
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit c9ad16ca2a2aff63fc4814c843cd376c76e43095 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:22:36 2018 +1000 Fix $abs_top_srcdir in test_rust.sh Consistently use ../../.. as a fallback for $abs_top_srcdir in test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha. --- changes/bug27093 | 3 +++ src/test/test_rust.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug27093 b/changes/bug27093 new file mode 100644 index 000000000..6c097f119 --- /dev/null +++ b/changes/bug27093 @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Consistently use ../../.. as a fallback for $abs_top_srcdir in + test_rust.sh. Fixes bug 27093; bugfix on 0.3.4.3-alpha. diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 9ad7a698a..2761b612b 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -3,7 +3,7 @@ set -e -export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt +export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp.txt for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then

1 0

[tor/release-0.3.4] Travis: fix a typo
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit f76cddd3762bf615eca7ca5d95b685671171fae8 Author: teor <teor(a)torproject.org> Date: Thu Aug 9 22:53:48 2018 +1000 Travis: fix a typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9671411b4..bc39f661b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ addons: #osx_image: xcode9.4 before_install: - ## If we're on OSX, homebrew usually needs to updated first + ## If we're on OSX, homebrew usually needs to be updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi ## We might be upgrading some useless packages, but that's better than missing an upgrade - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi

1 0

[tor/release-0.3.4] Changes file for Rust: backport src/test/test_rust.sh from master
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:26:53 2018 +1000 Changes file for Rust: backport src/test/test_rust.sh from master --- changes/bug26497-backport | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26497-backport b/changes/bug26497-backport new file mode 100644 index 000000000..1d86e01bf --- /dev/null +++ b/changes/bug26497-backport @@ -0,0 +1,3 @@ + o Minor bugfixes (rust): + - Backport test_rust.sh from master. + Fixes bug 26497; bugfix on 0.3.1.5-alpha.

1 0

[tor/release-0.3.4] Travis: Use cargo cache
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 3b1c74baa5e1b42c3271b2c74a665da6c528b106 Author: teor <teor(a)torproject.org> Date: Thu Aug 9 15:41:57 2018 +1000 Travis: Use cargo cache Closes ticket 26952. --- .travis.yml | 7 +++++++ changes/ticket26952-cargo | 3 +++ 2 files changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 25c31c3d2..8c2c9e3d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,11 @@ language: c cache: ccache: true + ## cargo: true + directories: + - $HOME/.cargo + ## where we point CARGO_TARGET_DIR in all our cargo invocations + - $TRAVIS_BUILD_DIR/src/rust/target compiler: - gcc @@ -116,6 +121,8 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi ## We might be upgrading some useless packages, but that's better than missing an upgrade - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi + ## Create empty rust directories for non-Rust builds, so caching succeeds + - if [[ "$RUST_OPTIONS" == "" ]]; then mkdir -p $HOME/.cargo $TRAVIS_BUILD_DIR/src/rust/target; fi install: ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) diff --git a/changes/ticket26952-cargo b/changes/ticket26952-cargo new file mode 100644 index 000000000..e1efdfcd7 --- /dev/null +++ b/changes/ticket26952-cargo @@ -0,0 +1,3 @@ + o Minor features (continuous integration, rust): + - Use cargo cache in our Travis CI configuration. + Closes ticket 26952.

1 0

[tor/release-0.3.4] Rust: use a consistent working directory in builds and tests
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 229a75a49a440e61c97dca820cf59360470e1560 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:54:26 2018 +1000 Rust: use a consistent working directory in builds and tests cd to ${abs_top_builddir}/src/rust before running cargo in src/test/test_rust.sh. Fixes bug 26497; bugfix on 0.3.3.2-alpha. --- changes/bug26497-cd | 4 ++++ src/test/test_rust.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug26497-cd b/changes/bug26497-cd new file mode 100644 index 000000000..37bf1bc95 --- /dev/null +++ b/changes/bug26497-cd @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - cd to ${abs_top_builddir}/src/rust before running cargo in + src/test/test_rust.sh. This makes the working directory consistent + between builds and tests. Fixes bug 26497; bugfix on 0.3.3.2-alpha. diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 2761b612b..4afc84285 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -7,7 +7,7 @@ export LSAN_OPTIONS=suppressions=${abs_top_srcdir:-../../..}/src/test/rust_supp. for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then - cd "${cargo_toml_dir}" && \ + cd "${abs_top_builddir:-../../..}/src/rust" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \

1 0

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