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 | df519e5de87d027ba51742b2b50710c69b9db2be (patch) | |
| tree | 22df1bc1f134fa3f2caa7539d0452752333bd723 | |
| parent | 9b10eb2d7abe703f544aca559d385fc7f2600009 (diff) | |
| parent | e813116d3d630d81feb97f39dd65fdf245eecebc (diff) | |
| download | tor-df519e5de87d027ba51742b2b50710c69b9db2be.tar.gz tor-df519e5de87d027ba51742b2b50710c69b9db2be.zip | |
Merge branch 'maint-0.3.1' into maint-0.3.2
| -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. |