diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-07-18 18:19:55 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-18 18:40:24 +0300 |
| commit | 7c2ae55fab2f0837531188373d276f168845e62f (patch) | |
| tree | fe72c10b2da78e49add1c593512e1012d2f261df /ci | |
| parent | b9154dd07c357ba616deefb7a608e8b2ca85b7ec (diff) | |
| download | meson-7c2ae55fab2f0837531188373d276f168845e62f.zip meson-7c2ae55fab2f0837531188373d276f168845e62f.tar.gz meson-7c2ae55fab2f0837531188373d276f168845e62f.tar.bz2 | |
Revert "Revert "Merge pull request #1931 from centricular/use-patched-ninja""
This reverts commit 5eb64a6f3e47b570f544524ef48dc6ef0e4dce59.
Let's try again, with a fixed Ninja by QuLogic.
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/appveyor-install.bat | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/appveyor-install.bat b/ci/appveyor-install.bat index becc80a..9eddeac 100644 --- a/ci/appveyor-install.bat +++ b/ci/appveyor-install.bat @@ -1,5 +1,7 @@ set CACHE=C:\cache set CYGWIN_MIRROR="http://cygwin.mirror.constant.com" +set CYGWIN_ADDITIONAL_REPO="http://www.dronecode.org.uk/cygwin/" +set CYGWIN_ADDITIONAL_REPO_KEY="http://www.dronecode.org.uk/cygwin/dronecode.gpg" if _%arch%_ == _x64_ set SETUP=setup-x86_64.exe && set CYGWIN_ROOT=C:\cygwin64 if _%arch%_ == _x86_ set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin @@ -7,5 +9,5 @@ if _%arch%_ == _x86_ set SETUP=setup-x86.exe && set CYGWIN_ROOT=C:\cygwin if not exist %CACHE% mkdir %CACHE% echo Updating Cygwin and installing ninja and test prerequisites -%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -l "%CACHE%" -g -P "ninja,gcc-objc,gcc-objc++,libglib2.0-devel,zlib-devel,python3-pip" +%CYGWIN_ROOT%\%SETUP% -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -s "%CYGWIN_ADDITIONAL_REPO%" -K "%CYGWIN_ADDITIONAL_REPO_KEY%" -l "%CACHE%" -g -P "ninja,gcc-objc,gcc-objc++,libglib2.0-devel,zlib-devel,python3-pip" echo Install done |