From acf0139ccb37e5f7f282d1e2670ea5f9419972fb Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Wed, 23 Mar 2016 19:08:59 +0501 Subject: [PATCH] servo: Merge #10131 - Move appveyor env var setting our of install steps (from servo:appveyor-env); r=larsbergstrom Source-Repo: https://github.com/servo/servo Source-Revision: b59bd294e177d84a2f54cec987f76a5fb97365f1 --- servo/appveyor.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/servo/appveyor.yml b/servo/appveyor.yml index 9a6037bac5f1..e6c87bafe71a 100644 --- a/servo/appveyor.yml +++ b/servo/appveyor.yml @@ -1,5 +1,10 @@ version: 1.0.{build} +environment: + PATH: 'C:\msys64\mingw64\bin;C:\msys64\usr\bin\;%PATH%' + MSYSTEM: 'MSYS' + MSYS: 'winsymlinks=lnk' + branches: only: - master @@ -13,9 +18,6 @@ cache: - .cargo 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 "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" @@ -31,4 +33,4 @@ build_script: bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./mach build -d -v" -test: off \ No newline at end of file +test: off