Skip to content

Commit 72424ad

Browse files
authored
Merge pull request #89 from fuine/fix-appveyor-stable
Fix appveyor builds for stable channel
2 parents 0f4821b + 1180240 commit 72424ad

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

appveyor.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
environment:
22
global:
33
PROJECT_NAME: lazy_static
4+
# When this was added there were revocation check failures when using the
5+
# libcurl backend as libcurl checks by default, but rustup doesn't provide the
6+
# switch to turn this off. Switch to Hyper which looks to not check for
7+
# revocation by default like libcurl does.
8+
RUSTUP_USE_REQWEST: 1
9+
CARGO_HTTP_CHECK_REVOKE: false
410
matrix:
511
# Stable channel
612
- TARGET: i686-pc-windows-gnu
@@ -33,12 +39,9 @@ environment:
3339
# Install Rust and Cargo
3440
# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)
3541
install:
36-
- ps: Start-FileDownload "https://static.rust-lang.org/dist/channel-rust-stable"
37-
- ps: $env:RUST_VERSION = Get-Content channel-rust-stable | select -first 1 | %{$_.split('-')[1]}
38-
- if NOT "%CHANNEL%" == "stable" set RUST_VERSION=%CHANNEL%
39-
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUST_VERSION}-${env:TARGET}.exe"
40-
- rust-%RUST_VERSION%-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
41-
- SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
42+
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
43+
- rustup-init.exe -y --default-host %TARGET%
44+
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
4245
- if "%TARGET%" == "i686-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw32\bin
4346
- if "%TARGET%" == "x86_64-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw64\bin
4447
- rustc -V
@@ -47,5 +50,5 @@ install:
4750
build: false
4851

4952
test_script:
50-
- cargo build --verbose
51-
- cargo test
53+
- cargo build --verbose --target %TARGET%
54+
- cargo test --target %TARGET%

0 commit comments

Comments
 (0)