aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2017-09-26 22:58:45 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2017-09-28 00:37:57 +0300
commitc654e58c538cc0174266e4604b2291630ee9f6b9 (patch)
tree4a01a3e097e8742710293753bc6d57d55a5fe4a1 /ci
parentdda5e8cadbfdeee3267b1a0943c014e06bcd0100 (diff)
downloadmeson-c654e58c538cc0174266e4604b2291630ee9f6b9.zip
meson-c654e58c538cc0174266e4604b2291630ee9f6b9.tar.gz
meson-c654e58c538cc0174266e4604b2291630ee9f6b9.tar.bz2
Revert "Add an additional Cygwin package repo with patched ninja"
This reverts commit 92c2bb75195c054dcdeae09f7d42393856a91748. This is no longer needed, as a patched ninja is now available from the standard Cygwin package repository, and prevents me from accidentally breaking CI when changing things in my personal package repository.
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