diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-08-29 12:58:25 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-08-29 12:58:25 -0400 |
| commit | 88a8deb420801085cfdbcb147a748a8138124bd3 (patch) | |
| tree | e16604bc1fa8c51d07aa6c4a5cf02629d8585651 /.travis.yml | |
| parent | 960d9894159ebd830e41db7ed9ae4e166235e331 (diff) | |
| parent | 360a29e282a546c47ad1346bb035ffb01fe11c0d (diff) | |
| download | tor-88a8deb420801085cfdbcb147a748a8138124bd3.tar.gz tor-88a8deb420801085cfdbcb147a748a8138124bd3.zip | |
Merge branch 'tor-github/pr/1236'
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index fe9266dffa..94d9bf9cce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,8 @@ env: - HARDENING_OPTIONS="--enable-expensive-hardening" ## We turn off asciidoc by default, because it's slow - ASCIIDOC_OPTIONS="--disable-asciidoc" + ## Our default rust version is the minimum supported version + - RUST_VERSION="1.31.0" matrix: ## We want to use each build option at least once ## @@ -55,9 +57,9 @@ matrix: # We clone our stem repo and run `make test-stem` - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## Check rust online with distcheck, to make sure we remove rust products - - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" + - env: DISTCHECK="yes" RUST_VERSION="beta" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" ## Check disable module dirauth with and without rust - - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - env: MODULES_OPTIONS="--disable-module-dirauth" RUST_VERSION="nightly" RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - env: MODULES_OPTIONS="--disable-module-dirauth" ## Check NSS - env: NSS_OPTIONS="--enable-nss" @@ -173,8 +175,8 @@ install: - 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 nightly channels of rustc and cargo and setup our toolchain environment - - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain nightly; fi + ## Install the stable channels of rustc and cargo and setup our toolchain environment + - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain $RUST_VERSION; 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 [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi |