@@ -27,7 +27,6 @@ environment:
2727 C:\\ Program Files\\ AppVeyor\\ BuildAgent;"
2828 matrix :
2929 - TARGET : nightly-x86_64-pc-windows-msvc
30- - TARGET : nightly-x86_64-pc-windows-gnu
3130
3231# Uncomment to enable RDP & wait for exit. Connection info will be printed in the log.
3332# init:
@@ -44,21 +43,11 @@ install:
4443 - ps : $env:PATH="$env:PATH;C:\rust\bin"
4544# I can't make this work with a multi-line script (e.g. via |+ etc.), so we copy the if before every command
4645 - if %TARGET:*-msvc=msvc%==msvc set BUILD_ENV=msvc
47- - if %TARGET:*-gnu=gnu%==gnu set BUILD_ENV=gnu
4846 - if %BUILD_ENV%==msvc call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
4947 - if %BUILD_ENV%==msvc copy C:\mozilla-build\yasm\yasm.exe C:\mozilla-build\msys\bin
5048 - if %BUILD_ENV%==msvc copy C:\mozilla-build\mozmake\mozmake.exe C:\mozilla-build\msys\bin
5149 - if %BUILD_ENV%==msvc set MOZTOOLS_PATH=C:\mozilla-build\msys\bin
5250 - if %BUILD_ENV%==msvc set NATIVE_WIN32_PYTHON=C:/Python27/python.exe
53- - if %BUILD_ENV%==gnu set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%
54- - if %BUILD_ENV%==gnu set MSYSTEM=MINGW64
55- - if %BUILD_ENV%==gnu set MSYS=winsymlinks=lnk
56- - if %BUILD_ENV%==gnu bash -lc "echo $MSYSTEM; pacman --needed --noconfirm -Sy pacman-mirrors"
57- - if %BUILD_ENV%==gnu bash -lc "pacman --noconfirm -Sy"
58- - if %BUILD_ENV%==gnu bash -lc "pacman -Sy --needed --noconfirm git mingw-w64-x86_64-toolchain tar make python2-setuptools"
59- - if %BUILD_ENV%==gnu bash -lc "easy_install-2.7 pip virtualenv"
60- - if %BUILD_ENV%==gnu bash -lc "mv /mingw64/bin/python2.exe /mingw64/bin/python2-mingw64.exe"
61- - if %BUILD_ENV%==gnu bash -lc "mv /mingw64/bin/python2.7.exe /mingw64/bin/python2.7-mingw64.exe"
6251 - rustc -vV
6352 - cargo -vV
6453
@@ -67,5 +56,3 @@ build_script:
6756 - echo VSINSTALLDIR %VSINSTALLDIR%
6857 - echo MOZTOOLS_PATH %MOZTOOLS_PATH%
6958 - if %BUILD_ENV%==msvc cd %APPVEYOR_BUILD_FOLDER% && cargo build && cargo test
70- - if %BUILD_ENV%==gnu bash -lc "cd $APPVEYOR_BUILD_FOLDER; cargo build && cargo test"
71-
0 commit comments