[tor-commits] [webwml/master] Remove blank new line character
commit a9ba136255686c2b359931e54825601d108a23d3 Author: hiro Date: Wed Aug 22 08:54:07 2018 +0200 Remove blank new line character --- docs/en/debian.wml | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index b4008f33..30684a4a 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -155,9 +155,7 @@ in place of. -If you want to use the development branch of Tor -instead (more features and more bugs), you need add a different set of lines to your -/etc/apt/sources.list file: +If you want to use the development branch of Tor instead (more features and more bugs), you need add a different set of lines to your /etc/apt/sources.list file: deb https://deb.torproject.org/torproject.org main deb https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x- main @@ -172,8 +170,7 @@ apt install apt-transport-https to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure). -To use Apt with Tor later replace https:// with tor:// and run - +To use Apt with Tor later replace https:// with tor:// and run apt install apt-transport-tor @@ -219,8 +216,7 @@ access it you might try to use the name of one of its part instead. Try deb.torproject.org is also served through now also served via onion service: -http://sdscoq7snqtznauu.onion";>http://sdscoq7snqtznauu.onion/ To use the onion service with -apt, replace the address in the previously added lines: +http://sdscoq7snqtznauu.onion";>http://sdscoq7snqtznauu.onion/ To use the onion service with apt, replace the address in the previously added lines: . # For the stable version. deb tor://sdscoq7snqtznauu.onion/torproject.org buster main ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] docs/debian: mention apt-transport-tor ; unhide onion address
commit 5ad79e06d1c9ef4934086fbf816249035eba9fb2 Author: Traumschule Date: Sat Aug 11 17:18:04 2018 +0200 docs/debian: mention apt-transport-tor ; unhide onion address --- docs/en/debian.wml | 101 + 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/docs/en/debian.wml b/docs/en/debian.wml index e93c8401..b4008f33 100644 --- a/docs/en/debian.wml +++ b/docs/en/debian.wml @@ -87,13 +87,14 @@ version -You need to add the following entry in /etc/apt/sources.list or a new file in /etc/apt/sources.list.d/: +You need to add the following entries to /etc/apt/sources.list or a new file in +/etc/apt/sources.list.d/: deb https://deb.torproject.org/torproject.org jessie main -Note: To use this source line in /etc/apt/sources.list The Note: To use source lines with https:// in /etc/apt/sources.list the https://packages.debian.org/stretch/apt-transport-https";>apt-transport-https package is required. Install it with @@ -101,6 +102,12 @@ apt install apt-transport-https to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure). +To use Apt with Tor later replace https:// with tor:// and run + +apt install apt-transport-tor + + + Then add the gpg key used to sign the packages by running the following commands at your command prompt: @@ -112,15 +119,13 @@ gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | sudo apt-key add - You can install it with the following commands: -$ apt update -$ apt install tor deb.torproject.org-keyring +apt update +apt install tor deb.torproject.org-keyring $ apt install build-essential fakeroot devscripts $ apt build-dep tor deb.torproject.org-keyring - -Then you can build Tor in ~/debian-packages: - +Then you can build Tor in ~/debian-packages: $ mkdir ~/debian-packages; cd ~/debian-packages $ apt source tor @@ -150,6 +155,30 @@ in place of. +If you want to use the development branch of Tor +instead (more features and more bugs), you need add a different set of lines to your +/etc/apt/sources.list file: + +deb https://deb.torproject.org/torproject.org main +deb https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x- main + + + +Note: To use source lines with https:// in /etc/apt/sources.list the https://packages.debian.org/stretch/apt-transport-https";>apt-transport-https +package is required. Install it with + +apt install apt-transport-https + +to enable the usage of 'deb https://foo distro main' lines in the /etc/apt/sources.list so that all package managers using the libapt-pkg library can access metadata and packages available in sources accessible over https (Hypertext Transfer Protocol Secure). + +To use Apt with Tor later replace https:// with tor:// and run + +apt install apt-transport-tor + + + + Then add the gpg key used to sign the packages by running the following commands at your command prompt: @@ -166,16 +195,9 @@ If there are no errors you're good to continue. We provide a Debian package to help you keep our signing key current. It is -recommended you use it. Install it using +recommended you use it. Install it along with tor using -apt install deb.torproject.org-keyring - - - - -To finally install Tor just run: - -apt install tor +apt install tor deb.torproject.org-keyring @@ -187,7 +209,6 @@ docs/tor-doc-unix>#using">step two of the "Tor on Linux/Unix" instructions. - The DNS name deb.torproject.org is actually a set of independent servers in a DNS round robin configuration. If you for some reason cannot @@ -198,46 +219,20 @@ access it you might try to use the name of one of its part instead. Try deb.torproject.org is also served through now also served via onion service: -http://sdscoq7snqtznauu.onion";>http://sdscoq7snqtznauu.onion/. +http://sdscoq7snqtznauu.onion";>http://sdscoq7snqtznauu.onion/ To use the onion service with +apt, replace the address in the previously added lines: +. +# For the stable version. +deb tor://sdscoq7snqtznauu.onion/torproject.org buster main + +# For the unstable version. +deb tor://sdscoq7snqtznauu.onion/torproject.org tor-nightly-master- main + See https://onion.torproject.org/";>https://onion.torproject.org for all torproject.org onion addresses. - - - -Option three: Using the -development branch of Tor on Debian or Ubuntu - - -If you want to use the development branch of Tor instead -(more features and more bugs), you need to add a different set of lines -to your /etc/apt/sources.list file: - -deb https://deb.torproject.org/torproject.org main -deb https://deb.torproject.org/torproject.org tor-experimental-0.3.4.x- main - -where you ag
[tor-commits] [webwml/master] debian-selector.js: Bump Tor to 0.3.4.x
commit e71dd8f10140cff8a62e22b284d063ef07e00df6
Author: Traumschule
Date: Sat Aug 11 15:54:16 2018 +0200
debian-selector.js: Bump Tor to 0.3.4.x
---
docs/debian-selector.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/debian-selector.js b/docs/debian-selector.js
index d0d31505..c8db5c2a 100644
--- a/docs/debian-selector.js
+++ b/docs/debian-selector.js
@@ -13,7 +13,7 @@ var software = {
'artful': [ 'artful'],
'bionic': [ 'bionic'],
},
- 'experimental-0.3.3.x': {
+ 'experimental-0.3.4.x': {
'jessie': [ 'jessie' ],
'stretch': [ 'stretch' ],
'buster': [ 'buster' ],
@@ -45,7 +45,7 @@ var software = {
'artful': [ 'artful'],
'bionic': [ 'bionic'],
},
- 'experimental-0.3.3.x': {
+ 'experimental-0.3.4.x': {
'jessie': [ 'jessie' ],
'stretch': [ 'stretch' ],
'buster': [ 'buster' ],
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/287'
commit e619fd02ef9a9926731244b2b19024a04f93fd5a Merge: 05cd3224a 3bf4493cb Author: Nick Mathewson Date: Tue Aug 21 20:08:55 2018 -0400 Merge remote-tracking branch 'tor-github/pr/287' src/test/test_address.c | 1 - 1 file changed, 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove duplicate include in src/test/test_address.c
commit 3bf4493cb9d400cf5cda864339de98dd3bf832e1 Author: Neel Chauhan Date: Tue Aug 21 20:01:48 2018 -0400 Remove duplicate include in src/test/test_address.c --- src/test/test_address.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 7e2ccc1b5..e99220f83 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -26,7 +26,6 @@ #include "core/or/or.h" #include "feature/nodelist/nodelist.h" #include "lib/net/address.h" -#include "lib/net/address.h" #include "test/test.h" #include "test/log_test_helpers.h" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-032' into travis-osx-033
commit 6463cdea55bbeb711a10153156a4b93f2471d034 Merge: ed1210d0f e2eec40c4 Author: teor 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(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4
commit 546c134801a17ebb63032b5ac52a65279998ea6f
Author: teor
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
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later
commit a544af818671eae8f265c687e24349061d3b8450 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034
commit 6e0be81211d7f9251231468c50b696aac2f8c9a1 Merge: 0f0dac0bf e1291aa84 Author: teor Date: Fri Aug 10 13:15:16 2018 +1000 Merge branch 'travis-osx-033' into travis-osx-034 Replace 034 .travis.yml with 033 .travis.yml. Subsequent commits will restore 034 functionality. Replace 034 src/test/test_rust.sh with 033 src/test/test_rust.sh, which was backported from master. .travis.yml | 271 +++ changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh| 7 +- 15 files changed, 190 insertions(+), 129 deletions(-) diff --cc src/rust/tor_rust/include.am index bcf94193f,40511bf9f..99f3ede65 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@@ -4,10 -4,9 +4,9 @@@ EXTRA_DIST += EXTRA_CARGO_OPTIONS= -src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE +@TOR_RUST_LIB_PATH@: 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" ) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
commit a29e9a901d196243791f9210be1fed1c177521df Merge: d52f40600 e2eec40c4 Author: Nick Mathewson Date: Tue Aug 21 20:03:41 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2 .travis.yml | 253 ++- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_util/include.am | 1 - src/test/test_rust.sh| 17 ++- 13 files changed, 194 insertions(+), 109 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
commit aac1e17f22acfc7338ec5290db55fbbfd8ddfdbf Merge: f68aab83b c28da0d8e Author: Nick Mathewson Date: Tue Aug 21 20:04:03 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4 .travis.yml | 276 --- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh| 7 +- 15 files changed, 195 insertions(+), 129 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034
commit c28da0d8e105515bafdb8a9710ab965a51b3c4eb Merge: a1c110a2a 6463cdea5 Author: teor 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(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-033' into travis-osx-034
commit a1c110a2a478d3fae50871741d52659cc34f4623 Merge: 2a33edc59 ed1210d0f Author: teor 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(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
commit f0633bc49164a10ca163aa94139222682af376f7 Merge: 245025a3d 6463cdea5 Author: Nick Mathewson Date: Tue Aug 21 20:03:56 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3 .travis.yml | 262 +-- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh| 6 +- 15 files changed, 191 insertions(+), 118 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4
commit e1291aa84a04b8006130ce08338ee07a662e5ce0
Author: teor
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
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: add a missing macOS asciidoc env var
commit d514e98663fbac3107d02f492fbff9d6018c275d Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-029' into travis-osx-032
commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7 Merge: 69adc68ac d514e9866 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-032' into travis-osx-033
commit ed1210d0f11d21ce97823f88bf20d3659a8927cf Merge: 546c13480 69adc68ac Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
commit 81e529d236f41607b133c5562e2d5887fcfd5b8a Merge: aac1e17f2 3cfceeb45 Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
commit 9d64304bec7c6159bcd66f614e91c1a25df2e7e3 Merge: c4e96a3de 81e529d23 Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 .travis.yml | 276 --- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh| 7 +- 15 files changed, 195 insertions(+), 129 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
commit 05d62a3b73ed092ec1643ead56d775bb5d06f648 Merge: 85a879234 d514e9866 Author: Nick Mathewson Date: Tue Aug 21 20:03:19 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9 .travis.yml| 213 ++--- changes/bug27088 | 5 ++ changes/ticket24629| 3 + changes/ticket26560| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087| 3 + 6 files changed, 140 insertions(+), 90 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: add a missing macOS asciidoc dependency
commit e78f9c5dfb55e71fa79c152d13a1ff72fd907040 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Check disable module dirauth with and without rust
commit 2a33edc595a619d6c2abcb260195f92d97192d6a Author: teor Date: Fri Aug 10 13:20:48 2018 +1000 Travis: Check disable module dirauth with and without rust Part of 24629, also fixes 27088. --- .travis.yml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f1b89e103..a8f9cc596 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,9 @@ matrix: ## 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="" +## Check disable module dirauth with rust, and without rust but with distcheck +- env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true HARDENING_OPTIONS="" +- env: DISTCHECK="yes" MODULES_OPTIONS="--disable-module-dirauth" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -166,7 +169,7 @@ install: script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Stop setting $CARGO_HOME
commit ce19477ffcdf64255f050308182f3d682e6f6de1
Author: teor
Date: Fri Aug 10 11:00:46 2018 +1000
Stop setting $CARGO_HOME
cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default.
Fixes bug 26497; bugfix on 0.3.1.5-alpha.
---
changes/bug26497 | 3 +++
src/rust/tor_util/include.am | 1 -
src/test/test_rust.sh| 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changes/bug26497 b/changes/bug26497
new file mode 100644
index 0..d0c05ff3e
--- /dev/null
+++ b/changes/bug26497
@@ -0,0 +1,3 @@
+ o Minor bugfixes (rust):
+- Stop setting $CARGO_HOME. cargo will use the user's $CARGO_HOME, or
+ $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha.
diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am
index ec3898577..c11060289 100644
--- a/src/rust/tor_util/include.am
+++ b/src/rust/tor_util/include.am
@@ -7,7 +7,6 @@ EXTRA_DIST +=\
src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@: FORCE
( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \
CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
- CARGO_HOME="$(abs_top_builddir)/src/rust" \
$(CARGO) build --release --quiet $(CARGO_ONLINE) )
FORCE:
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 4ecca7834..9ad7a698a 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -9,7 +9,6 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*;
do
if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
cd "${cargo_toml_dir}" && \
CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
- CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
"${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
${EXTRA_CARGO_OPTIONS} \
--manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-032' into travis-osx-033
commit 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 Merge: c4d0d9bd2 4517c4c3e Author: teor 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(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: create configure flags once, then echo the flags
commit 7cf7b52fcab81c55a4c493bad68eddc0d27a0d63 Author: teor Date: Thu Aug 9 17:06:13 2018 +1000 Travis: create configure flags once, then echo the flags Creating the configure flags once avoids inconsistent flags between configure and distcheck configure. Echoing the flags helps developers work out what configure is doing. (Backported to 0.2.9 and later as a precaution.) Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases. --- .travis.yml | 6 -- changes/bug27088 | 5 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d75c74ebb..6169c808a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,10 +108,12 @@ install: script: - ./autogen.sh - - ./configure $COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules + - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" + - echo $CONFIGURE_FLAGS + - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$HARDENING_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules"; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: ## configure will leave a log file with more details of config failures. diff --git a/changes/bug27088 b/changes/bug27088 new file mode 100644 index 0..d4d3b292c --- /dev/null +++ b/changes/bug27088 @@ -0,0 +1,5 @@ + o Minor bugfixes (continuous integration): +- Pass the module flags to distcheck configure, and + log the flags before running configure. (Backported + to 0.2.9 and later as a precaution.) + Fixes bug 27088; bugfix on 0.3.4.1-alpha. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Check Rust with distcheck in 0.3.3 and later
commit f5aa667d48d88f917371219ddefce26637c2b1ad Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: put distcheck first for readability
commit f4f2e43f5dfa6da163ec89ab67baa4f2f13b3197 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Changes file for Travis: enable macOS builds
commit 4cd3fcf2481868a693c31957fe0d61d69bf1312b Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: add rust cargo online mode
commit 14ceee0fd1cc82da9fc6cd51d69173546bc4d7fd Author: teor Date: Thu Aug 9 22:32:20 2018 +1000 Travis: add rust cargo online mode Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Also: * build rust on clang and gcc, Linux and macOS * build combinations of non-default options on gcc Linux * exclude broken builds * log the rustup version Part of 24629. --- .travis.yml | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e61c3ba8b..43392b3f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,11 @@ env: ## We don't list default variable values, because we set the defaults ## in global (or the default is unset) - +## We turn off hardening for Rust builds, because they are incompatible, +## and it's going to take a while for them to be fixed. See: +## https:/trac.torproject.org/projects/tor/ticket/25386 +## https:/trac.torproject.org/projects/tor/ticket/26398 +- RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" matrix: ## include creates builds with gcc, linux, sudo: false @@ -36,7 +41,8 @@ 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" @@ -129,14 +135,26 @@ 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 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 ## ## 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 + ## Get some info about rustup, rustc and cargo + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustup; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-029' into travis-osx-032
commit 69adc68ac6031246f9c5a723755c87d6abf34fc6 Merge: 169afe3ca e78f9c5df Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am
commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 Author: teor 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" ) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: add rust cargo offline mode
commit e387eee362fc5c73b7b54c2e887d08816732a0ae Author: teor 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..8d34a 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Changes file for Rust: backport src/test/test_rust.sh from master
commit 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: list installed package versions before building
commit fa9a0cc1fe81bef8584f446829b6fcef258cc762 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Fix $abs_top_srcdir in test_rust.sh
commit c9ad16ca2a2aff63fc4814c843cd376c76e43095
Author: teor
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 0..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
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Use cargo cache
commit 3b1c74baa5e1b42c3271b2c74a665da6c528b106 Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: fix a typo
commit aee51d9a0e0772d6ad65613f67a63ab8856b7b50 Author: teor 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 8d34a..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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: fix a typo
commit f76cddd3762bf615eca7ca5d95b685671171fae8 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Improve Rust comments
commit 169afe3ca52fc8b201f00fe8b262c75e79a199d5 Author: teor 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="" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Changes file for Travis: enable macOS builds
commit a5715a46c4d4b96c68ea4b30ad98c685ffadf7c2 Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Check Rust with distcheck in 0.3.3 and later
commit 7ec75e014fb7e736cdf392a4ca11196c0d492044 Author: teor 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 81f449797..f1b89e103 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: DISTCHECK="yes" ASCIIDOC_OPTIONS="" -## 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: put distcheck first for readability
commit f398da2e2d2c2472619b1c42463cbf2ccc84cc6a Author: teor 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="" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later
commit 82cccfbe25c3e5b5be14323b545c68c7eb52400c Author: teor 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 c7ea5948e..81f449797 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: 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="" +- 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: add lzma and zstd, where available
commit e4d7f2667c6c4660ad9663a39fbdef7d3e2961cd Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Merge branch 'travis-osx-029' into travis-osx-032
commit 38cf52b0238bd95893935936cd5925d176c5bbb8 Merge: 8e68fe7e1 fa9a0cc1f Author: teor Date: Thu Aug 9 22:20:29 2018 +1000 Merge branch 'travis-osx-029' into travis-osx-032 Replace 032 .travis.yml with 029 .travis.yml. Subsequent commits will restore 032 functionality. .travis.yml| 227 - changes/bug27088 | 5 + changes/ticket26560| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087| 3 + 5 files changed, 133 insertions(+), 108 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Rust: backport src/test/test_rust.sh from master
commit 2a35b085977376b5c5e2dd084f9f505d8f8a
Author: teor
Date: Fri Aug 10 11:09:18 2018 +1000
Rust: backport src/test/test_rust.sh from master
Preparation for 26497.
---
src/test/test_rust.sh | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index d559f94ce..4ecca7834 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -1,13 +1,19 @@
#!/bin/sh
-# Test all the Rust crates we're using
+# Test all Rust crates
-crates=tor_util
+set -e
-exitcode=0
+export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt
-for crate in $crates; do
-cd "${abs_top_srcdir:-.}/src/rust/${crate}"
-CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target"
CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test
${CARGO_ONLINE-"--frozen"} || exitcode=1
+for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
+if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
+ cd "${cargo_toml_dir}" && \
+ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
+ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
+ "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
+ ${EXTRA_CARGO_OPTIONS} \
+ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
+fi
done
exit $exitcode
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Rust: use a consistent working directory in builds and tests
commit 229a75a49a440e61c97dca820cf59360470e1560
Author: teor
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 0..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} \
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: make macOS builds work for Tor 0.2.9
commit 74b3a340df0df1eb803b4b17039725fc42d5a86a Author: teor Date: Thu Aug 9 17:44:11 2018 +1000 Travis: make macOS builds work for Tor 0.2.9 Tor 0.2.9 needs extra help to find OpenSSL on macOS. Part of 24629. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6169c808a..c2db6b78b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,13 +102,15 @@ 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 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 ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi script: - ./autogen.sh - - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" - echo $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Use ccache
commit 286a6bc3b8fd2c369583d0d48c09769fed78e39f Author: teor Date: Thu Aug 9 15:40:27 2018 +1000 Travis: Use ccache Part of ticket 26952. --- .travis.yml| 6 ++ changes/ticket26952-ccache | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index c2db6b78b..424f0d070 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: c +cache: + ccache: true + compiler: - gcc - clang @@ -94,6 +97,9 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi install: + ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi diff --git a/changes/ticket26952-ccache b/changes/ticket26952-ccache new file mode 100644 index 0..edc115e9d --- /dev/null +++ b/changes/ticket26952-ccache @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Use ccache in our Travis CI configuration. + Closes ticket 26952. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: run an asciidoc build
commit 23b242104ba5cefb5fd16effda33a611e521050d Author: teor Date: Thu Aug 9 18:29:29 2018 +1000 Travis: run an asciidoc build Implements 27087. --- .travis.yml | 15 +-- changes/ticket27087 | 3 +++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 424f0d070..d822780cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,8 @@ env: ## We turn on hardening by default ## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later - HARDENING_OPTIONS="--enable-expensive-hardening" +## We turn off asciidoc by default, because it's slow +- ASCIIDOC_OPTIONS="--disable-asciidoc" matrix: ## We want to use each build option at least once ## @@ -34,8 +36,9 @@ 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: DISTCHECK="yes" - env: HARDENING_OPTIONS="" +## We check asciidoc with distcheck, to make sure we remove doc products +- env: ASCIIDOC_OPTIONS="" DISTCHECK="yes" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -84,6 +87,12 @@ addons: - libcap-dev - libscrypt-dev - libseccomp-dev + ## Conditional dependencies + ## Always installed, so we don't need sudo + - asciidoc + - docbook-xsl + - docbook-xml + - xmlto ## (OSX only) Use the default OSX image ## See https://docs.travis-ci.com/user/reference/osx#os-x-version @@ -113,10 +122,12 @@ install: ## Install conditional features ## Install coveralls - 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 script: - ./autogen.sh - - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. diff --git a/changes/ticket27087 b/changes/ticket27087 new file mode 100644 index 0..b8af70aaa --- /dev/null +++ b/changes/ticket27087 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Run asciidoc during Travis CI. + Implements ticket 27087. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Add more optional packages to Travis
commit 340da669be373174550e038d1d20ff2bff49eb6b Author: Taylor Yu Date: Thu Jun 28 14:43:31 2018 -0500 Add more optional packages to Travis Apparently we weren't building with either libcap or libseccomp on Travis. Install libcap-dev and libseccomp-dev in .travis.yml. Closes ticket 26560. --- .travis.yml | 3 ++- changes/ticket26560 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a3e1bfc0..e3735f7d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,11 +42,12 @@ addons: packages: ## Required dependencies - libevent-dev - - libseccomp2 - zlib1g-dev ## Optional dependencies + - libcap-dev - liblzma-dev - libscrypt-dev + - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd diff --git a/changes/ticket26560 b/changes/ticket26560 new file mode 100644 index 0..5b4fb1bfe --- /dev/null +++ b/changes/ticket26560 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Install libcap-dev and libseccomp2-dev so these optional + dependencies get tested on Travis CI. Closes ticket 26560. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: enable macOS builds
commit 515d190b2ca9249871d04067c3bdbd312669997e Author: teor Date: Thu Aug 9 18:03:18 2018 +1000 Travis: enable macOS builds Also: * explain why we don't install zlib Part of 24629. --- .travis.yml | 20 1 file changed, 20 insertions(+) diff --git a/.travis.yml b/.travis.yml index dfdf20f31..d75c74ebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ compiler: os: - linux + - osx ## The build matrix in the following stanza expands into builds for each ## OS and compiler. @@ -81,7 +82,26 @@ addons: - libscrypt-dev - libseccomp-dev +## (OSX only) Use the default OSX image +## See https://docs.travis-ci.com/user/reference/osx#os-x-version +## Default is Xcode 9.4 on macOS 10.13 as of August 2018 +#osx_image: xcode9.4 + +before_install: + ## If we're on OSX, homebrew usually needs to 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 + install: + ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi + ## macOS comes with zlib by default, so the homebrew install is keg-only + # - 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 ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
commit 16dec180e704a67eee93841e47e68cf55464351f Merge: 60d6a2ca6 3cfceeb45 Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .travis.yml | 262 +-- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh| 6 +- 15 files changed, 191 insertions(+), 118 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033
commit ed1210d0f11d21ce97823f88bf20d3659a8927cf Merge: 546c13480 69adc68ac Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
commit a29e9a901d196243791f9210be1fed1c177521df Merge: d52f40600 e2eec40c4 Author: Nick Mathewson Date: Tue Aug 21 20:03:41 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2 .travis.yml | 253 ++- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_util/include.am | 1 - src/test/test_rust.sh| 17 ++- 13 files changed, 194 insertions(+), 109 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
commit 3cfceeb45d51f8f3c4960cabaad1849dcecb14a3 Merge: f0633bc49 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
commit 05d62a3b73ed092ec1643ead56d775bb5d06f648 Merge: 85a879234 d514e9866 Author: Nick Mathewson Date: Tue Aug 21 20:03:19 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9 .travis.yml| 213 ++--- changes/bug27088 | 5 ++ changes/ticket24629| 3 + changes/ticket26560| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087| 3 + 6 files changed, 140 insertions(+), 90 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.4] Travis: Rewrite .travis.yml
commit c53f17fb1a3b787567cee1e87f03a887a5cee0bd
Author: teor
Date: Thu Aug 9 16:42:05 2018 +1000
Travis: Rewrite .travis.yml
Build on all compilers:
* default options + hardening
Build on gcc:
* coverage (+ no hardening)
* distcheck
* no hardening
Add some extra logging:
* tail config.log on failure
(config.log is too long for travis to render)
Put the config in a more logical order
* Sort config items in chronological order
* Put related items together
Part of 24629.
---
.travis.yml | 175 +++-
1 file changed, 80 insertions(+), 95 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e3735f7d5..dfdf20f31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,68 +1,38 @@
language: c
-## Comment out the compiler list for now to allow an explicit build
-## matrix.
-# compiler:
-# - gcc
-# - clang
-
-notifications:
- irc:
-channels:
- - "irc.oftc.net#tor-ci"
-template:
- - "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}"
- - "Build #%{build_number} %{result}. Details: %{build_url}"
-on_success: change
-on_failure: change
- email:
-on_success: never
-on_failure: change
+compiler:
+ - gcc
+ - clang
os:
- linux
- ## Uncomment the following line to also run the entire build matrix on OSX.
- ## This will make your CI builds take roughly ten times longer to finish.
- # - osx
-
-## Use the Ubuntu Trusty images.
-dist: trusty
-
-## We don't need sudo. (The "apt:" stanza after this allows us to not need
sudo;
-## otherwise, we would need it for getting dependencies.)
-##
-## We override this in the explicit build matrix to work around a
-## Travis CI environment regression
-## https://github.com/travis-ci/travis-ci/issues/9033
-sudo: false
-## (Linux only) Download our dependencies
-addons:
- apt:
-packages:
- ## Required dependencies
- - libevent-dev
- - zlib1g-dev
- ## Optional dependencies
- - libcap-dev
- - liblzma-dev
- - libscrypt-dev
- - libseccomp-dev
- ## zstd doesn't exist in Ubuntu Trusty
- #- libzstd
-
-## The build matrix in the following two stanzas expands into four builds (per
OS):
-##
-## * with GCC, with Rust
-## * with GCC, without Rust
-## * with Clang, with Rust
-## * with Clang, without Rust
+## The build matrix in the following stanza expands into builds for each
+## OS and compiler.
env:
global:
## The Travis CI environment allows us two cores, so let's use both.
- MAKEFLAGS="-j 2"
+## We turn on hardening by default
+## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later
+- HARDENING_OPTIONS="--enable-expensive-hardening"
+ matrix:
+## We want to use each build option at least once
+##
+## We don't list default variable values, because we set the defaults
+## in global (or the default is unset)
+-
matrix:
+ ## include creates builds with gcc, linux, sudo: false
+ include:
+## We include a single coverage build with the best options for coverage
+- 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: DISTCHECK="yes"
+- env: HARDENING_OPTIONS=""
+
## Uncomment to allow the build to report success (with non-required
## sub-builds continuing to run) if all required sub-builds have
## succeeded. This is somewhat buggy currently: it can cause
@@ -71,60 +41,62 @@ matrix:
## https://github.com/travis-ci/travis-ci/issues/1696
# fast_finish: true
- ## Uncomment the appropriate lines below to allow the build to
- ## report success even if some less-critical sub-builds fail and it
- ## seems likely to take a while for someone to fix it. Currently
- ## Travis CI doesn't distinguish "all builds succeeded" from "some
- ## non-required sub-builds failed" except on the individual build's
- ## page, which makes it somewhat annoying to detect from the
- ## branches and build history pages. See
- ## https://github.com/travis-ci/travis-ci/issues/8716
- allow_failures:
-# - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
-# - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode
-# - compiler: clang
-
- ## Create explicit matrix entries to work around a Travis CI
- ## environment issue. Missing keys inherit from the first list
- ## entry under that key outside the "include" clause.
- include:
-- compiler: gcc
-- compiler: gcc
- env: COVERAGE_OPTIONS="--enable-coverage"
-- compiler: gcc
- env: DISTCHECK="yes"
-## The "sudo: required" forces non-containerized builds, working
-## around a Travis CI environment issue: clang LeakAnalyzer fails
-## because it requires ptrace and the containerized environment no
-## longer allows
[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
commit f0633bc49164a10ca163aa94139222682af376f7 Merge: 245025a3d 6463cdea5 Author: Nick Mathewson Date: Tue Aug 21 20:03:56 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3 .travis.yml | 262 +-- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug26497-cd | 4 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket24629-backport | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_rust/include.am | 2 - src/test/test_rust.sh| 6 +- 15 files changed, 191 insertions(+), 118 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033
commit 6463cdea55bbeb711a10153156a4b93f2471d034 Merge: ed1210d0f e2eec40c4 Author: teor 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(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: Use TOR_RUST_DEPENDENCIES for 0.3.3 and later
commit a544af818671eae8f265c687e24349061d3b8450 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: put distcheck first for readability
commit f4f2e43f5dfa6da163ec89ab67baa4f2f13b3197 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: add a missing macOS asciidoc env var
commit d514e98663fbac3107d02f492fbff9d6018c275d Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: Check Rust with distcheck in 0.3.3 and later
commit f5aa667d48d88f917371219ddefce26637c2b1ad Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-029' into travis-osx-032
commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7 Merge: 69adc68ac d514e9866 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Rust: Use --all-features in test_rust.sh for 0.3.3 and 0.3.4
commit 546c134801a17ebb63032b5ac52a65279998ea6f
Author: teor
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
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-029' into travis-osx-032
commit 69adc68ac6031246f9c5a723755c87d6abf34fc6 Merge: 169afe3ca e78f9c5df Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: Use cargo cache
commit 3b1c74baa5e1b42c3271b2c74a665da6c528b106 Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Changes file for Travis: enable macOS builds
commit 4cd3fcf2481868a693c31957fe0d61d69bf1312b Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: add a missing macOS asciidoc dependency
commit e78f9c5dfb55e71fa79c152d13a1ff72fd907040 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033
commit 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 Merge: c4d0d9bd2 4517c4c3e Author: teor 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(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: Improve Rust comments
commit 169afe3ca52fc8b201f00fe8b262c75e79a199d5 Author: teor 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="" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Changes file for Rust: backport src/test/test_rust.sh from master
commit 4517c4c3e38fe93d668ab84dc5e7cb3bd0a3c173 Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: fix a typo
commit aee51d9a0e0772d6ad65613f67a63ab8856b7b50 Author: teor 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 8d34a..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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Rust: use a consistent working directory in builds and tests
commit 229a75a49a440e61c97dca820cf59360470e1560
Author: teor
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 0..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} \
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am
commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 Author: teor 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" ) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: add rust cargo online mode
commit 14ceee0fd1cc82da9fc6cd51d69173546bc4d7fd Author: teor Date: Thu Aug 9 22:32:20 2018 +1000 Travis: add rust cargo online mode Forward-ports parts of the 0.3.2 travis config on top of the 0.2.9 merge. Also: * build rust on clang and gcc, Linux and macOS * build combinations of non-default options on gcc Linux * exclude broken builds * log the rustup version Part of 24629. --- .travis.yml | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e61c3ba8b..43392b3f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,11 @@ env: ## We don't list default variable values, because we set the defaults ## in global (or the default is unset) - +## We turn off hardening for Rust builds, because they are incompatible, +## and it's going to take a while for them to be fixed. See: +## https:/trac.torproject.org/projects/tor/ticket/25386 +## https:/trac.torproject.org/projects/tor/ticket/26398 +- RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" HARDENING_OPTIONS="" matrix: ## include creates builds with gcc, linux, sudo: false @@ -36,7 +41,8 @@ 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" @@ -129,14 +135,26 @@ 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 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 ## ## 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 + ## Get some info about rustup, rustc and cargo + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustup; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then which cargo; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustup --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then rustc --version; fi + - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi script: - ./autogen.sh - - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Stop setting $CARGO_HOME
commit ce19477ffcdf64255f050308182f3d682e6f6de1
Author: teor
Date: Fri Aug 10 11:00:46 2018 +1000
Stop setting $CARGO_HOME
cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default.
Fixes bug 26497; bugfix on 0.3.1.5-alpha.
---
changes/bug26497 | 3 +++
src/rust/tor_util/include.am | 1 -
src/test/test_rust.sh| 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changes/bug26497 b/changes/bug26497
new file mode 100644
index 0..d0c05ff3e
--- /dev/null
+++ b/changes/bug26497
@@ -0,0 +1,3 @@
+ o Minor bugfixes (rust):
+- Stop setting $CARGO_HOME. cargo will use the user's $CARGO_HOME, or
+ $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha.
diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am
index ec3898577..c11060289 100644
--- a/src/rust/tor_util/include.am
+++ b/src/rust/tor_util/include.am
@@ -7,7 +7,6 @@ EXTRA_DIST +=\
src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@: FORCE
( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \
CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
- CARGO_HOME="$(abs_top_builddir)/src/rust" \
$(CARGO) build --release --quiet $(CARGO_ONLINE) )
FORCE:
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index 4ecca7834..9ad7a698a 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -9,7 +9,6 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*;
do
if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
cd "${cargo_toml_dir}" && \
CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
- CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
"${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
${EXTRA_CARGO_OPTIONS} \
--manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: add lzma and zstd, where available
commit e4d7f2667c6c4660ad9663a39fbdef7d3e2961cd Author: teor 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 0..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. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Fix $abs_top_srcdir in test_rust.sh
commit c9ad16ca2a2aff63fc4814c843cd376c76e43095
Author: teor
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 0..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
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Rust: backport src/test/test_rust.sh from master
commit 2a35b085977376b5c5e2dd084f9f505d8f8a
Author: teor
Date: Fri Aug 10 11:09:18 2018 +1000
Rust: backport src/test/test_rust.sh from master
Preparation for 26497.
---
src/test/test_rust.sh | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh
index d559f94ce..4ecca7834 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -1,13 +1,19 @@
#!/bin/sh
-# Test all the Rust crates we're using
+# Test all Rust crates
-crates=tor_util
+set -e
-exitcode=0
+export LSAN_OPTIONS=suppressions=${abs_top_srcdir}/src/test/rust_supp.txt
-for crate in $crates; do
-cd "${abs_top_srcdir:-.}/src/rust/${crate}"
-CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target"
CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test
${CARGO_ONLINE-"--frozen"} || exitcode=1
+for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
+if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
+ cd "${cargo_toml_dir}" && \
+ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
+ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
+ "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
+ ${EXTRA_CARGO_OPTIONS} \
+ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1
+fi
done
exit $exitcode
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Travis: add a missing macOS asciidoc dependency
commit e78f9c5dfb55e71fa79c152d13a1ff72fd907040 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Add more optional packages to Travis
commit 340da669be373174550e038d1d20ff2bff49eb6b Author: Taylor Yu Date: Thu Jun 28 14:43:31 2018 -0500 Add more optional packages to Travis Apparently we weren't building with either libcap or libseccomp on Travis. Install libcap-dev and libseccomp-dev in .travis.yml. Closes ticket 26560. --- .travis.yml | 3 ++- changes/ticket26560 | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6a3e1bfc0..e3735f7d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,11 +42,12 @@ addons: packages: ## Required dependencies - libevent-dev - - libseccomp2 - zlib1g-dev ## Optional dependencies + - libcap-dev - liblzma-dev - libscrypt-dev + - libseccomp-dev ## zstd doesn't exist in Ubuntu Trusty #- libzstd diff --git a/changes/ticket26560 b/changes/ticket26560 new file mode 100644 index 0..5b4fb1bfe --- /dev/null +++ b/changes/ticket26560 @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Install libcap-dev and libseccomp2-dev so these optional + dependencies get tested on Travis CI. Closes ticket 26560. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'travis-osx-029' into travis-osx-032
commit e2eec40c4469c10dfb3006dfb07240d7e1144aa7 Merge: 69adc68ac d514e9866 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: Rewrite .travis.yml
commit c53f17fb1a3b787567cee1e87f03a887a5cee0bd
Author: teor
Date: Thu Aug 9 16:42:05 2018 +1000
Travis: Rewrite .travis.yml
Build on all compilers:
* default options + hardening
Build on gcc:
* coverage (+ no hardening)
* distcheck
* no hardening
Add some extra logging:
* tail config.log on failure
(config.log is too long for travis to render)
Put the config in a more logical order
* Sort config items in chronological order
* Put related items together
Part of 24629.
---
.travis.yml | 175 +++-
1 file changed, 80 insertions(+), 95 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e3735f7d5..dfdf20f31 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,68 +1,38 @@
language: c
-## Comment out the compiler list for now to allow an explicit build
-## matrix.
-# compiler:
-# - gcc
-# - clang
-
-notifications:
- irc:
-channels:
- - "irc.oftc.net#tor-ci"
-template:
- - "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}"
- - "Build #%{build_number} %{result}. Details: %{build_url}"
-on_success: change
-on_failure: change
- email:
-on_success: never
-on_failure: change
+compiler:
+ - gcc
+ - clang
os:
- linux
- ## Uncomment the following line to also run the entire build matrix on OSX.
- ## This will make your CI builds take roughly ten times longer to finish.
- # - osx
-
-## Use the Ubuntu Trusty images.
-dist: trusty
-
-## We don't need sudo. (The "apt:" stanza after this allows us to not need
sudo;
-## otherwise, we would need it for getting dependencies.)
-##
-## We override this in the explicit build matrix to work around a
-## Travis CI environment regression
-## https://github.com/travis-ci/travis-ci/issues/9033
-sudo: false
-## (Linux only) Download our dependencies
-addons:
- apt:
-packages:
- ## Required dependencies
- - libevent-dev
- - zlib1g-dev
- ## Optional dependencies
- - libcap-dev
- - liblzma-dev
- - libscrypt-dev
- - libseccomp-dev
- ## zstd doesn't exist in Ubuntu Trusty
- #- libzstd
-
-## The build matrix in the following two stanzas expands into four builds (per
OS):
-##
-## * with GCC, with Rust
-## * with GCC, without Rust
-## * with Clang, with Rust
-## * with Clang, without Rust
+## The build matrix in the following stanza expands into builds for each
+## OS and compiler.
env:
global:
## The Travis CI environment allows us two cores, so let's use both.
- MAKEFLAGS="-j 2"
+## We turn on hardening by default
+## Also known as --enable-fragile-hardening in 0.3.0.3-alpha and later
+- HARDENING_OPTIONS="--enable-expensive-hardening"
+ matrix:
+## We want to use each build option at least once
+##
+## We don't list default variable values, because we set the defaults
+## in global (or the default is unset)
+-
matrix:
+ ## include creates builds with gcc, linux, sudo: false
+ include:
+## We include a single coverage build with the best options for coverage
+- 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: DISTCHECK="yes"
+- env: HARDENING_OPTIONS=""
+
## Uncomment to allow the build to report success (with non-required
## sub-builds continuing to run) if all required sub-builds have
## succeeded. This is somewhat buggy currently: it can cause
@@ -71,60 +41,62 @@ matrix:
## https://github.com/travis-ci/travis-ci/issues/1696
# fast_finish: true
- ## Uncomment the appropriate lines below to allow the build to
- ## report success even if some less-critical sub-builds fail and it
- ## seems likely to take a while for someone to fix it. Currently
- ## Travis CI doesn't distinguish "all builds succeeded" from "some
- ## non-required sub-builds failed" except on the individual build's
- ## page, which makes it somewhat annoying to detect from the
- ## branches and build history pages. See
- ## https://github.com/travis-ci/travis-ci/issues/8716
- allow_failures:
-# - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
-# - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode
-# - compiler: clang
-
- ## Create explicit matrix entries to work around a Travis CI
- ## environment issue. Missing keys inherit from the first list
- ## entry under that key outside the "include" clause.
- include:
-- compiler: gcc
-- compiler: gcc
- env: COVERAGE_OPTIONS="--enable-coverage"
-- compiler: gcc
- env: DISTCHECK="yes"
-## The "sudo: required" forces non-containerized builds, working
-## around a Travis CI environment issue: clang LeakAnalyzer fails
-## because it requires ptrace and the containerized environment no
-## longer allows
[tor-commits] [tor/release-0.3.3] Travis: Use ccache
commit 286a6bc3b8fd2c369583d0d48c09769fed78e39f Author: teor Date: Thu Aug 9 15:40:27 2018 +1000 Travis: Use ccache Part of ticket 26952. --- .travis.yml| 6 ++ changes/ticket26952-ccache | 3 +++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index c2db6b78b..424f0d070 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: c +cache: + ccache: true + compiler: - gcc - clang @@ -94,6 +97,9 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi install: + ## If we're on OSX use brew to install ccache (ccache is automatically installed on Linux) + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/ccache/libexec:$PATH"; fi ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi diff --git a/changes/ticket26952-ccache b/changes/ticket26952-ccache new file mode 100644 index 0..edc115e9d --- /dev/null +++ b/changes/ticket26952-ccache @@ -0,0 +1,3 @@ + o Minor features (continuous integration): +- Use ccache in our Travis CI configuration. + Closes ticket 26952. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: list installed package versions before building
commit fa9a0cc1fe81bef8584f446829b6fcef258cc762 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: create configure flags once, then echo the flags
commit 7cf7b52fcab81c55a4c493bad68eddc0d27a0d63 Author: teor Date: Thu Aug 9 17:06:13 2018 +1000 Travis: create configure flags once, then echo the flags Creating the configure flags once avoids inconsistent flags between configure and distcheck configure. Echoing the flags helps developers work out what configure is doing. (Backported to 0.2.9 and later as a precaution.) Fixes 27088 on 0.3.4.1-alpha, adds logging in previous releases. --- .travis.yml | 6 -- changes/bug27088 | 5 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d75c74ebb..6169c808a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -108,10 +108,12 @@ install: script: - ./autogen.sh - - ./configure $COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules + - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" + - echo $CONFIGURE_FLAGS + - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" ]]; then make check; fi - - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$HARDENING_OPTIONS $COVERAGE_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules"; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi after_failure: ## configure will leave a log file with more details of config failures. diff --git a/changes/bug27088 b/changes/bug27088 new file mode 100644 index 0..d4d3b292c --- /dev/null +++ b/changes/bug27088 @@ -0,0 +1,5 @@ + o Minor bugfixes (continuous integration): +- Pass the module flags to distcheck configure, and + log the flags before running configure. (Backported + to 0.2.9 and later as a precaution.) + Fixes bug 27088; bugfix on 0.3.4.1-alpha. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: enable macOS builds
commit 515d190b2ca9249871d04067c3bdbd312669997e Author: teor Date: Thu Aug 9 18:03:18 2018 +1000 Travis: enable macOS builds Also: * explain why we don't install zlib Part of 24629. --- .travis.yml | 20 1 file changed, 20 insertions(+) diff --git a/.travis.yml b/.travis.yml index dfdf20f31..d75c74ebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ compiler: os: - linux + - osx ## The build matrix in the following stanza expands into builds for each ## OS and compiler. @@ -81,7 +82,26 @@ addons: - libscrypt-dev - libseccomp-dev +## (OSX only) Use the default OSX image +## See https://docs.travis-ci.com/user/reference/osx#os-x-version +## Default is Xcode 9.4 on macOS 10.13 as of August 2018 +#osx_image: xcode9.4 + +before_install: + ## If we're on OSX, homebrew usually needs to 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 + install: + ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above) + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi + ## macOS comes with zlib by default, so the homebrew install is keg-only + # - 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 ## Install conditional features ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Travis: add a missing macOS asciidoc env var
commit d514e98663fbac3107d02f492fbff9d6018c275d Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: fix a typo
commit f76cddd3762bf615eca7ca5d95b685671171fae8 Author: teor 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: add rust cargo offline mode
commit e387eee362fc5c73b7b54c2e887d08816732a0ae Author: teor 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..8d34a 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 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.3] Travis: make macOS builds work for Tor 0.2.9
commit 74b3a340df0df1eb803b4b17039725fc42d5a86a Author: teor Date: Thu Aug 9 17:44:11 2018 +1000 Travis: make macOS builds work for Tor 0.2.9 Tor 0.2.9 needs extra help to find OpenSSL on macOS. Part of 24629. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6169c808a..c2db6b78b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -102,13 +102,15 @@ 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 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 ## Install coveralls - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi script: - ./autogen.sh - - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" + - CONFIGURE_FLAGS="$COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --disable-asciidoc --enable-fatal-warnings --disable-silent-rules" - echo $CONFIGURE_FLAGS - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
commit a5bbe3f1d0d8162e70af01f6b3956412dcc75946 Merge: a29e9a901 05d62a3b7 Author: Nick Mathewson Date: Tue Aug 21 20:03:46 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
commit 54e2a3315a94b86454b687600bb02ada96b3699c Merge: 22414c050 a5bbe3f1d Author: Nick Mathewson Date: Tue Aug 21 20:04:17 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 253 ++- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_util/include.am | 1 - src/test/test_rust.sh| 17 ++- 13 files changed, 194 insertions(+), 109 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
commit a29e9a901d196243791f9210be1fed1c177521df Merge: d52f40600 e2eec40c4 Author: Nick Mathewson Date: Tue Aug 21 20:03:41 2018 -0400 Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2 .travis.yml | 253 ++- changes/bug26497 | 3 + changes/bug26497-backport| 3 + changes/bug27088 | 5 + changes/bug27090 | 3 + changes/bug27093 | 3 + changes/ticket24629 | 3 + changes/ticket26560 | 3 + changes/ticket26952-cargo| 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + src/rust/tor_util/include.am | 1 - src/test/test_rust.sh| 17 ++- 13 files changed, 194 insertions(+), 109 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
