summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgnzlbg <gonzalobg88@gmail.com>2019-07-05 18:55:42 +0200
committergnzlbg <gonzalobg88@gmail.com>2019-07-05 18:55:42 +0200
commit9f9286331fcdd0524856e04993ebeb60dc1c150d (patch)
treec9afbac8b244ca616ecf6d66ef438b86d41b6e53
parentfd7a1e9f837fd3e423ebacc185d8cab77492cf0c (diff)
downloadrust-libc-9f9286331fcdd0524856e04993ebeb60dc1c150d.tar.gz
Fix appveyor try 3
-rw-r--r--appveyor.yml22
1 files changed, 9 insertions, 13 deletions
diff --git a/appveyor.yml b/appveyor.yml
index b047175c32..c3a333a642 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,23 +1,19 @@
environment:
- # When this was added there were revocation check failures when using the
- # libcurl backend as libcurl checks by default, but rustup doesn't provide the
- # switch to turn this off. Switch to Reqwest which looks to not check for
- # revocation by default like libcurl does.
- RUSTUP_USE_REQWEST: 1
- CARGO_HTTP_CHECK_REVOKE: false
matrix:
- TARGET: x86_64-pc-windows-gnu
- MSYS2_BITS: 64
+ MSYS_BITS: 64
+ ARCH: x86_64
- TARGET: i686-pc-windows-gnu
- MSYS2_BITS: 32
+ MSYS_BITS: 32
+ ARCH: i686
- TARGET: x86_64-pc-windows-msvc
- TARGET: i686-pc-windows-msvc
install:
- - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
- - rustup-init.exe -y --default-host %TARGET%
- - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
- - if defined MSYS2_BITS set PATH=%PATH%;C:\msys64\mingw%MSYS2_BITS%\bin
- - if defined MSYS2_BITS for %%I in (crt2.o dllcrt2.o libmsvcrt.a) do xcopy /Y "C:\msys64\mingw%MSYS2_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files (x86)\Rust\lib\rustlib\%TARGET%\lib"
+ - if defined MSYS_BITS set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%;
+ - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
+ - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
+ - set PATH=%PATH%;C:\Program Files (x86)\Rust\bin
+ - if defined MSYS_BITS for %%I in (crt2.o dllcrt2.o libmsvcrt.a) do xcopy /Y "C:\msys64\mingw%MSYS_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files (x86)\Rust\lib\rustlib\%TARGET%\lib"
- rustc -V
- cargo -V