Switch Travis to stable rust

diff --git a/.travis.yml b/.travis.yml
index d6450d270bb8b7727704ec6162cdd669b84e5a28..0c01884106a690ab3971f8a49dcc6fd78f2268b2 100644 (file)
--- 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 (file)
index 0000000..63823fc
--- /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.