Skip to content

Commit 75e326a

Browse files
committed
Auto merge of #6093 - ehuss:appveyor-fix, r=alexcrichton
Clean up appveyor config. - Use correct version for minimal-versions check. - Don't bother downloading OTHER_TARGET for minimal-versions. - Remove an old/unused env var. Fixes #6087
2 parents 4e09634 + 0c54822 commit 75e326a

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

appveyor.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ environment:
22
matrix:
33
- TARGET: x86_64-pc-windows-msvc
44
OTHER_TARGET: i686-pc-windows-msvc
5-
MAKE_TARGETS: test-unit-x86_64-pc-windows-msvc
65
- TARGET: x86_64-pc-windows-msvc
7-
OTHER_TARGET: i686-pc-windows-msvc
8-
MAKE_TARGETS: test-unit-x86_64-pc-windows-msvc
96
MINIMAL_VERSIONS: true
107
CFG_DISABLE_CROSS_TESTS: 1
118

@@ -15,7 +12,7 @@ install:
1512
- rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly
1613
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
1714
- if defined MINIMAL_VERSIONS rustup toolchain install 1.28.0
18-
- rustup target add %OTHER_TARGET%
15+
- if defined OTHER_TARGET rustup target add %OTHER_TARGET%
1916
- rustc -V
2017
- cargo -V
2118
- git submodule update --init
@@ -28,5 +25,5 @@ test_script:
2825
# we don't have ci time to run the full `cargo test` with `minimal-versions` like
2926
# - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable test
3027
# so we just run `cargo check --tests` like
31-
- if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo check --tests
28+
- if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +1.28.0 check --tests
3229
- if NOT defined MINIMAL_VERSIONS cargo test

0 commit comments

Comments
 (0)