Try running appveyor on master instead of nightly

rust-lang · Jul 20, 2018 · f226101 · f226101
1 parent 70987d3
commit f226101
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -17,6 +17,11 @@ install:
     - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
     - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin;C:\Users\appveyor\.rustup\toolchains\nightly-%TARGET%\bin
     - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
+    - cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+    - set RUSTC_HEAD=`git ls-remote https://github.com/rust-lang/rust.git HEAD | tr -d ",." | tr " \t" "\n" | grep -e "HEAD" -v`
+    - rustup-toolchain-install-master %RUSTC_HEAD%
+    - rustup default %RUSTC_HEAD%
+    - set PATH=%PATH%;C:\Users\appveyor\.rustup\toolchains\%RUSTC_HEAD%\bin
     - rustc -V
     - cargo -V
 

diff --git a/ci/base-tests.sh b/ci/base-tests.sh
@@ -1,7 +1,7 @@
 set -ex
 cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
 RUSTC_HEAD=`git ls-remote https://github.com/rust-lang/rust.git HEAD | tr -d ",." | tr " \t" "\n" | grep -e "HEAD" -v`
-rustup-toolchain-install-master $RUSTC_HEAD
+travis_retry rustup-toolchain-install-master $RUSTC_HEAD
 rustup default $RUSTC_HEAD
 PATH=$PATH:./node_modules/.bin
 remark -f *.md > /dev/null