Auto merge of #10131 - servo:appveyor-env, r=larsbergstrom

Move appveyor env var setting our of install steps.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10131)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-23 19:37:59 +05:30
commit b59bd294e1

View file

@ -1,5 +1,10 @@
version: 1.0.{build} version: 1.0.{build}
environment:
PATH: 'C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%'
MSYSTEM: 'MSYS'
MSYS: 'winsymlinks=lnk'
branches: branches:
only: only:
- master - master
@ -13,9 +18,6 @@ cache:
- .cargo - .cargo
install: install:
- set MSYSTEM=MSYS
- set MSYS="winsymlinks=lnk"
- PATH C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%
- bash -lc "echo $MSYSTEM; pacman --needed --noconfirm -Sy pacman-mirrors" - bash -lc "echo $MSYSTEM; pacman --needed --noconfirm -Sy pacman-mirrors"
- bash -lc "pacman --noconfirm -Sy" - bash -lc "pacman --noconfirm -Sy"
- bash -lc "pacman -Sy --needed --noconfirm git mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch patchutils make python2-setuptools" - bash -lc "pacman -Sy --needed --noconfirm git mingw-w64-x86_64-toolchain mingw-w64-x86_64-freetype mingw-w64-x86_64-icu mingw-w64-x86_64-nspr mingw-w64-x86_64-ca-certificates mingw-w64-x86_64-expat mingw-w64-x86_64-cmake tar diffutils patch patchutils make python2-setuptools"
@ -31,4 +33,4 @@ build_script:
bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./mach build -d -v" bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./mach build -d -v"
test: off test: off