aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-07-17 22:45:17 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-07-18 00:30:52 +0200
commit5eb64a6f3e47b570f544524ef48dc6ef0e4dce59 (patch)
tree0ce453d143e3c4507f254010cb28b93f5d77f87f /ci
parent2009fdbd434279f0feddccc610067dedb7a26133 (diff)
downloadmeson-5eb64a6f3e47b570f544524ef48dc6ef0e4dce59.zip
meson-5eb64a6f3e47b570f544524ef48dc6ef0e4dce59.tar.gz
meson-5eb64a6f3e47b570f544524ef48dc6ef0e4dce59.tar.bz2
Revert "Merge pull request #1931 from centricular/use-patched-ninja"
This reverts commit aab7ada356e02033e4030143cf363d06d975283b, reversing changes made to e1b24765afd9e7d2d8043a408d69c7ad814d3551.
Diffstat (limited to 'ci')
-rw-r--r--ci/appveyor-install.bat4
1 files changed, 1 insertions, 3 deletions
diff --git a/ci/appveyor-install.bat b/ci/appveyor-install.bat
index 9eddeac..becc80a 100644
--- a/ci/appveyor-install.bat
+++ b/ci/appveyor-install.bat
@@ -1,7 +1,5 @@
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
@@ -9,5 +7,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%" -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"
+%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"
echo Install done