diff options
| author | Taylor Yu <catalyst@torproject.org> | 2018-04-04 17:07:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-05 08:36:09 -0400 |
| commit | e813116d3d630d81feb97f39dd65fdf245eecebc (patch) | |
| tree | 1ff95778ccfd09cb0926a312cb5a8b73fe85d989 | |
| parent | 834eef2452a667c5557e5a09bb879cc2fc98a661 (diff) | |
| download | tor-e813116d3d630d81feb97f39dd65fdf245eecebc.tar.gz tor-e813116d3d630d81feb97f39dd65fdf245eecebc.zip | |
Switch Travis to stable rust
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | changes/ticket25714 | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d6450d270b..0c01884106 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 0000000000..63823fc6ca --- /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. |