[tor-commits] [tor/release-0.3.2] Switch Travis to stable rust

[nickm@xxxxxxxxxxxxxx]

commit e813116d3d630d81feb97f39dd65fdf245eecebc
Author: Taylor Yu <catalyst@xxxxxxxxxxxxxx>
Date:   Wed Apr 4 17:07:39 2018 -0500

    Switch Travis to stable rust
---
 .travis.yml         | 4 ++--
 changes/ticket25714 | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6450d270..0c0188410 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -122,8 +122,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
diff --git a/changes/ticket25714 b/changes/ticket25714
new file mode 100644
index 000000000..63823fc6c
--- /dev/null
+++ b/changes/ticket25714
@@ -0,0 +1,4 @@
+  o Minor feature (continuous integration):
+    - Update the Travis CI configuration to use the stable Rust
+      channel, now that we have decided to require that.  Closes
+      ticket 25714.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits