浏览代码

[AppVeyor] use pre-installed cygwin

Andy Li 11 年之前
父节点
当前提交
623c78974f
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      appveyor.yml

+ 4 - 4
appveyor.yml

@@ -1,5 +1,7 @@
 version: "{build}"
 
+os: unstable #http://help.appveyor.com/discussions/suggestions/427-pre-install-cygwin
+
 platform:
     - Win32
 
@@ -7,12 +9,11 @@ clone_folder: C:/projects/haxe
 
 environment:
     global:
-        CYG_MIRROR: http://cygwin.uib.no
-        CYG_CACHE: C:/cygwin/var/cache/setup
         NEKO_ROOT: C:/projects/neko
     matrix:
         -   CYG_ARCH: x86
             CYG_ROOT: C:/cygwin
+            CYG_SETUP: C:/cygwin/setup-x86.exe
             WODI_ARCH: 32
             MINGW_ARCH: i686
         # -   CYG_ARCH: x86_64
@@ -26,8 +27,7 @@ init:
 install:
     - 'git submodule update --init --recursive'
     # Install ocaml using wodi
-    - 'appveyor DownloadFile http://cygwin.com/setup-%CYG_ARCH%.exe -FileName cygwin-setup.exe'
-    - 'cygwin-setup.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P wget -P dos2unix -P diffutils -P cpio -P make -P patch -P mingw64-%MINGW_ARCH%-gcc-core -P mingw64-%MINGW_ARCH%-gcc-g++ >NUL'
+    - '%CYG_ROOT%/setup-%CYG_ARCH%.exe -q -R "%CYG_ROOT%" -P wget -P dos2unix -P diffutils -P cpio -P make -P patch -P mingw64-%MINGW_ARCH%-gcc-core -P mingw64-%MINGW_ARCH%-gcc-g++ >NUL'
     - '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
     - '%CYG_ROOT%/bin/bash -lc "wget -q http://ml.ignorelist.com/wodi/8/wodi%WODI_ARCH%.tar.xz -O /tmp/wodi%WODI_ARCH%.tar.xz"'
     - '%CYG_ROOT%/bin/bash -lc "cd /tmp && rm -rf wodi%WODI_ARCH% && tar -xf wodi%WODI_ARCH%.tar.xz && bash wodi%WODI_ARCH%/install.sh"'