Just drop the part about duplicate issues

[cargo.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 7b9e406a2c3d50589fb1c6c2f3e790e2d0ff84ae..282633ee07121804dae5e806ad151da856ef2caa 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,38 +1,17 @@
 environment:
-  RUSTFLAGS: -Zunstable-options -Ctarget-feature=+crt-static
   matrix:
-  - TARGET: x86_64-pc-windows-gnu
-    BITS: 64
-    CFG_DISABLE_CROSS_TESTS: 1
-    MAKE_TARGETS: test-unit-x86_64-pc-windows-gnu
-  - TARGET: i686-pc-windows-gnu
-    BITS: 32
-    MINGW_URL: https://s3.amazonaws.com/rust-lang-ci
-    MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
-    MINGW_DIR: mingw32
-    CFG_DISABLE_CROSS_TESTS: 1
-    MAKE_TARGETS: test-unit-i686-pc-windows-gnu
-  - TARGET: i686-pc-windows-msvc
-    BITS: 32
-    MAKE_TARGETS: test-unit-i686-pc-windows-msvc
-    CFG_DISABLE_CROSS_TESTS: 1
-    ALLOW_PR: 1
   - TARGET: x86_64-pc-windows-msvc
     OTHER_TARGET: i686-pc-windows-msvc
-    BITS: 64
-    MAKE_TARGETS: test-unit-x86_64-pc-windows-msvc
+  - TARGET: x86_64-pc-windows-msvc
+    MINIMAL_VERSIONS: true
+    CFG_DISABLE_CROSS_TESTS: 1
 
 install:
-  - set PATH=C:\msys64\mingw%BITS%\bin;C:\msys64\usr\bin;%PATH%
-  - if defined MINGW_URL appveyor DownloadFile %MINGW_URL%/%MINGW_ARCHIVE%
-  - if defined MINGW_URL 7z x -y %MINGW_ARCHIVE% > nul
-  - if defined MINGW_URL set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
-
-  # FIXME(#3394) use master rustup
-  - curl -sSfO https://static.rust-lang.org/rustup/archive/0.6.5/x86_64-pc-windows-msvc/rustup-init.exe
+  - if NOT defined APPVEYOR_PULL_REQUEST_NUMBER if "%APPVEYOR_REPO_BRANCH%" == "master" appveyor exit
+  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
   - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain nightly
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
+  - if defined MINIMAL_VERSIONS rustup toolchain install 1.28.0
   - if defined OTHER_TARGET rustup target add %OTHER_TARGET%
   - rustc -V
   - cargo -V
@@ -43,29 +22,8 @@ clone_depth: 1
 build: false
 
 test_script:
-  - sh src/ci/run.sh %TARGET%
-
-before_deploy:
-  - ps: |
-        New-Item -Path deploy -ItemType directory
-        Get-ChildItem -Path target\${env:TARGET}\release\dist -Filter '*.tar.gz' | Move-Item -Destination deploy
-        Get-FileHash .\deploy\* | ForEach-Object {
-          [io.file]::WriteAllText($_.Path + ".sha256", $_.Hash.ToLower() + "`n")
-        }
-        Get-ChildItem -Path deploy | Foreach-Object {
-          Push-AppveyorArtifact $_.FullName -FileName ${env:APPVEYOR_REPO_COMMIT}/$_
-        }
-
-deploy:
-  - provider: S3
-    skip_cleanup: true
-    access_key_id: AKIAIWZDM2B2IJOWBGTA
-    secret_access_key:
-      secure: hyH54di5NyNdV+jjntM1dRN/NeUgDidwZmwcg4/UKpdJqGf1AAwYb2ulXYK67CXA
-    bucket: rust-lang-ci
-    set_public: true
-    region: us-east-1
-    folder: cargo-builds
-    artifact: /.*\.(tar.gz|sha256)/
-    on:
-      branch: auto-cargo
+  # we don't have ci time to run the full `cargo test` with `minimal-versions` like
+  # - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +stable test
+  # so we just run `cargo check --tests` like
+  - if defined MINIMAL_VERSIONS cargo +nightly generate-lockfile -Z minimal-versions && cargo +1.28.0 check --tests
+  - if NOT defined MINIMAL_VERSIONS cargo test