Skip to content

Commit f1e065a

Browse files
committed
build: Remove *-windows-gnu builds
1 parent 17e46e0 commit f1e065a

File tree

2 files changed

+2
-40
lines changed

2 files changed

+2
-40
lines changed

appveyor.yml

+2-36
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ environment:
44
RUST_BACKTRACE: 1
55
matrix:
66
- TARGET: x86_64-pc-windows-msvc
7+
NO_ADD: 1
78
ALLOW_PR: 1
89
- TARGET: i686-pc-windows-msvc
9-
- TARGET: x86_64-pc-windows-gnu
10-
MINGW_DIR: mingw64
11-
- TARGET: i686-pc-windows-gnu
12-
MINGW_DIR: mingw32
1310
access_token:
1411
secure: q8Wqx0brgfpOYFQqWauvucE2h0o1WYb41a3gKaCKV9QiE4eTz6qLNlqyC3mdsp4Q
1512
branches:
@@ -25,41 +22,14 @@ install:
2522
- if defined APPVEYOR_PULL_REQUEST_NUMBER if NOT defined ALLOW_PR appveyor exit
2623
- if "%APPVEYOR_REPO_BRANCH%" == "master" if NOT defined ALLOW_PR appveyor exit
2724

28-
# Install MSYS2 and MINGW (32-bit & 64-bit)
29-
- ps: |
30-
# Check if MSYS2 was restored from cache
31-
if($env:MINGW_DIR) {
32-
if($env:MINGW_DIR -eq "mingw32") {
33-
# Download and install MINGW (32-bit)
34-
Write-Host "Installing MinGW (32-bit)..." -ForegroundColor Cyan
35-
Write-Host "Downloading installation package..."
36-
appveyor-retry appveyor DownloadFile https://rust-lang-ci.s3.amazonaws.com/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -FileName mingw.7z
37-
} elseif($env:MINGW_DIR -eq "mingw64") {
38-
# Download and install MINGW (64-bit)
39-
Write-Host "Installing MinGW (64-bit)..." -ForegroundColor Cyan
40-
Write-Host "Downloading installation package..."
41-
appveyor-retry appveyor DownloadFile https://rust-lang-ci.s3.amazonaws.com/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -FileName mingw.7z
42-
}
43-
Write-Host "Extracting installation package..."
44-
7z x -y mingw.7z -oC:\msys64 | Out-Null
45-
del mingw.7z
46-
} else {
47-
Write-Host "MSYS2 not required" -ForegroundColor Green
48-
}
49-
5025
# Install rust, x86_64-pc-windows-msvc host
5126
- appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
5227
- rustup-init.exe -y --default-host=x86_64-pc-windows-msvc
5328
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
5429
- del rustup-init.exe
5530

5631
# Install the target we're compiling for
57-
- if NOT "%TARGET%" == "x86_64-pc-windows-msvc" rustup target add %TARGET%
58-
59-
# add mingw to PATH if necessary
60-
- if defined MINGW_DIR set PATH=C:\msys64\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
61-
# And if mingw, re-put appveyor's git in place
62-
- if defined MINGW_DIR set PATH=C:\Program Files\Git\cmd;%PATH%
32+
- if NOT defined NO_ADD rustup target add %TARGET%
6333

6434
# let's see what we got
6535
- where gcc rustc cargo
@@ -73,10 +43,6 @@ test_script:
7343
- cargo run --release --target %TARGET% --locked -- --dump-testament
7444
- cargo test --release --target %TARGET%
7545

76-
notifications:
77-
- provider: Webhook
78-
url: https://webhooks.gitter.im/e/9907ad94eb7a5ff291c3
79-
8046
after_test:
8147
- powershell -File ci/prepare-deploy-appveyor.ps1
8248

ci/cloudfront-invalidation.txt

-4
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ rustup/dist/i686-apple-darwin/rustup-init
1919
rustup/dist/i686-apple-darwin/rustup-init.sha256
2020
rustup/dist/i686-linux-android/rustup-init
2121
rustup/dist/i686-linux-android/rustup-init.sha256
22-
rustup/dist/i686-pc-windows-gnu/rustup-init.exe
23-
rustup/dist/i686-pc-windows-gnu/rustup-init.exe.sha256
2422
rustup/dist/i686-pc-windows-msvc/rustup-init.exe
2523
rustup/dist/i686-pc-windows-msvc/rustup-init.exe.sha256
2624
rustup/dist/i686-unknown-linux-gnu/rustup-init
@@ -45,8 +43,6 @@ rustup/dist/x86_64-apple-darwin/rustup-init
4543
rustup/dist/x86_64-apple-darwin/rustup-init.sha256
4644
rustup/dist/x86_64-linux-android/rustup-init
4745
rustup/dist/x86_64-linux-android/rustup-init.sha256
48-
rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe
49-
rustup/dist/x86_64-pc-windows-gnu/rustup-init.exe.sha256
5046
rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe
5147
rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe.sha256
5248
rustup/dist/x86_64-unknown-freebsd/rustup-init

0 commit comments

Comments
 (0)