diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-05 08:36:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-05 08:36:13 -0400 |
| commit | 2dee38fba0193c952500b9d0227ebcff6d5432d6 (patch) | |
| tree | 448b36c260e6b72d07e6facae5d2f78898db3130 /.travis.yml | |
| parent | 78bf56416868ed6de53af63d49c6d8555150f856 (diff) | |
| parent | df519e5de87d027ba51742b2b50710c69b9db2be (diff) | |
| download | tor-2dee38fba0193c952500b9d0227ebcff6d5432d6.tar.gz tor-2dee38fba0193c952500b9d0227ebcff6d5432d6.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fa8536def5..27534e4cfe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,8 +128,8 @@ install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated xz || brew upgrade xz; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated libscrypt || brew upgrade libscrypt; }; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then { brew outdated zstd || brew upgrade zstd; }; 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 stable; fi - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi ## Get some info about rustc and cargo - if [[ "$RUST_OPTIONS" != "" ]]; then which rustc; fi |