diff options
| author | Aleksey Filippov <alekseyf@google.com> | 2018-03-15 15:32:53 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-03-22 11:01:10 +0530 |
| commit | a10956f1635537af2a45608ad5708c0dc42d2bfe (patch) | |
| tree | 70ee2d7e566ef5ad2560e5925239f70e51fe3af5 | |
| parent | 8da3e95bb5ba9dd151251bf0aaa1235620248b2b (diff) | |
| download | meson-0.45.zip meson-0.45.tar.gz meson-0.45.tar.bz2 | |
Fix appveyor failures: do not use PowerShell since it triggers NativeCommandError if pacman prints to stderr0.45
Split command to avoid "The input line is too long." error.
Also use --needed for pacman to not reinstall already installed packages.
| -rw-r--r-- | .appveyor.yml | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 2645364..a6b91b2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -81,20 +81,14 @@ install: - cmd: if %compiler%==msvc2015 ( call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %arch% ) - cmd: if %compiler%==msvc2017 ( call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat" -arch=%arch% ) - cmd: if %compiler%==cygwin ( set PYTHON=python3 ) else ( set PYTHON=python ) - - ps: | - If($Env:compiler -eq 'msys2-mingw') { - If($Env:arch -eq 'x86') { - $env:Path = 'C:\msys64\mingw32\bin;' + $env:Path - $env:MESON_PYTHON_PATH = 'C:\msys64\mingw32\bin' - $env:PYTHON = 'python3' - C:\msys64\usr\bin\pacman -S --noconfirm mingw32/mingw-w64-i686-python3 - } Else { - $env:Path = 'C:\msys64\mingw64\bin;' + $env:Path - $env:MESON_PYTHON_PATH = 'C:\msys64\mingw64\bin' - $env:PYTHON = 'python3' - C:\msys64\usr\bin\pacman -S --noconfirm mingw64/mingw-w64-x86_64-python3 - } - } + # MinGW setup, lines are split to prevent "The input line is too long." error. + - cmd: if %arch%==x86 ( set "PACMAN_ARCH=i686" ) else ( set "PACMAN_ARCH=x86_64" ) + - cmd: if %arch%==x86 ( set "PACMAN_BITS=32" ) else ( set "PACMAN_BITS=64" ) + - cmd: if %compiler%==msys2-mingw ( set "PATH=C:\msys64\mingw%PACMAN_BITS%\bin;%PATH%" ) + - cmd: if %compiler%==msys2-mingw ( set "MESON_PYTHON_PATH=C:\msys64\mingw%PACMAN_BITS%\bin" ) + - cmd: if %compiler%==msys2-mingw ( set "PYTHON=python3" ) + - cmd: if %compiler%==msys2-mingw ( C:\msys64\usr\bin\pacman -S --needed --noconfirm "mingw%PACMAN_BITS%/mingw-w64-%PACMAN_ARCH%-python3" ) + # Cygwin - cmd: if not %compiler%==cygwin ( set "PATH=%cd%;%MESON_PYTHON_PATH%;%PATH%;" ) - cmd: if %compiler%==cygwin ( set WRAPPER=ci\run-in-cygwin.bat ) - cmd: if %compiler%==cygwin ( %WRAPPER% which %PYTHON% ) else ( where %PYTHON% ) |