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

[tor/release-0.3.3] 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.3] 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.3] 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/maint-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/maint-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/maint-0.3.4] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 Author: teor <teor(a)torproject.org> Date: Fri Aug 10 11:47:36 2018 +1000 Stop setting $CARGO_HOME in src/rust/tor_rust/include.am cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha. --- src/rust/tor_rust/include.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index c02324cb7..40511bf9f 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -7,7 +7,6 @@ EXTRA_CARGO_OPTIONS= src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) @@ -15,7 +14,6 @@ src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE distclean-rust: ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ $(CARGO_ONLINE) \ --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )

1 0

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

22 Aug '18

commit f398da2e2d2c2472619b1c42463cbf2ccc84cc6a 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 8c2c9e3d6..c7ea5948e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ 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 distcheck (see above) ## TOR_RUST_DEPENDENCIES is spelt RUST_DEPENDENCIES in 0.3.2 - env: RUST_OPTIONS="--enable-rust" RUST_DEPENDENCIES=true HARDENING_OPTIONS=""

1 0

[tor/maint-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/maint-0.3.4] Changes file for Travis: enable macOS builds
by nickm＠torproject.org 22 Aug '18

22 Aug '18

commit a5715a46c4d4b96c68ea4b30ad98c685ffadf7c2 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/maint-0.3.4] 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