[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/maint-0.3.4] Merge branch 'travis-osx-029' into travis-osx-032
commit 69adc68ac6031246f9c5a723755c87d6abf34fc6
Merge: 169afe3ca e78f9c5df
Author: teor <teor@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits