diff options
| author | Andrew Gallant <jamslam@gmail.com> | 2016-09-21 19:27:12 -0400 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2016-09-21 19:27:12 -0400 |
| commit | 5644bbe43ae47de25f2361cc1cb82a69cd700471 (patch) | |
| tree | e786d4f01652b85a1d60805778150a8d7b5da228 | |
| parent | aeb3a5ba0f20a6c1be6e7d8011854d9d0cd03deb (diff) | |
attempt to fix Windows build
| -rw-r--r-- | appveyor.yml | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/appveyor.yml b/appveyor.yml index 1423fa80..1aebffd4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,27 +2,22 @@ environment: global: PROJECT_NAME: ripgrep matrix: - # Nightly channel - TARGET: i686-pc-windows-gnu - CHANNEL: nightly + CHANNEL: stable - TARGET: i686-pc-windows-msvc - CHANNEL: nightly + CHANNEL: stable - TARGET: x86_64-pc-windows-gnu - CHANNEL: nightly + CHANNEL: stable - TARGET: x86_64-pc-windows-msvc - CHANNEL: nightly + CHANNEL: stable # Install Rust and Cargo # (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml) install: - - ps: Start-FileDownload "https://static.rust-lang.org/dist/channel-rust-stable" - - ps: $env:RUST_VERSION = Get-Content channel-rust-stable | select -first 1 | %{$_.split('-')[1]} - - if NOT "%CHANNEL%" == "stable" set RUST_VERSION=%CHANNEL% - - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUST_VERSION}-${env:TARGET}.exe" - - rust-%RUST_VERSION%-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust" - - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin - - if "%TARGET%" == "i686-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw32\bin - - if "%TARGET%" == "x86_64-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw64\bin + - curl -sSf -o rustup-init.exe https://win.rustup.rs/ + - 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 - rustc -V - cargo -V |