Merge branch 'Cog' of http://github.com/OpenSmalltalk/vm into Cog

OpenSmalltalk · Jun 18, 2016 · d289259 · d289259
2 parents 0b48a56 + 9109f49
commit d289259
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 31 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -191,32 +191,6 @@ matrix:
             - gcc-multilib
             - uuid-dev:i386
 
-    - os: linux
-      env: ARCH="linux32ARM" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
-      sudo: required
-      dist: trusty
-      group: edge
-    - os: linux
-      env: ARCH="linux32ARM" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi -- bash -c "
-      sudo: required
-      dist: trusty
-      group: edge
-    - os: linux
-      env: ARCH="linux32ARM" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
-      sudo: required
-      dist: trusty
-      group: edge
-    - os: linux
-      env: ARCH="linux32ARM" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi -- bash -c "
-      sudo: required
-      dist: trusty
-      group: edge
-    - os: linux
-      env: ARCH="linux32ARM" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi -- bash -c "
-      sudo: required
-      dist: trusty
-      group: edge
-
     - os: osx
       env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
     - os: osx
@@ -225,8 +199,8 @@ matrix:
       env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
     - os: osx
       env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
-    - os: osx
-      env: ARCH="macos64x64" FLAVOR="squeak.sista.spur"
+    # - os: osx
+    #   env: ARCH="macos64x64" FLAVOR="squeak.sista.spur"
     - os: osx
       env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
 
@@ -247,6 +221,32 @@ matrix:
     - os: osx
       env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
 
+    - os: linux
+      env: ARCH="linux32ARM" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
+      sudo: required
+      dist: trusty
+      group: edge
+    - os: linux
+      env: ARCH="linux32ARM" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi -- bash -c "
+      sudo: required
+      dist: trusty
+      group: edge
+    - os: linux
+      env: ARCH="linux32ARM" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
+      sudo: required
+      dist: trusty
+      group: edge
+    - os: linux
+      env: ARCH="linux32ARM" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi -- bash -c "
+      sudo: required
+      dist: trusty
+      group: edge
+    - os: linux
+      env: ARCH="linux32ARM" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi -- bash -c "
+      sudo: required
+      dist: trusty
+      group: edge
+
 install:
   - ./.travis_install.sh
 script:

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,8 @@
 environment:
+  CYG_ROOT: C:\cygwin
+  CYG_MIRROR: http://cygwin.mirror.constant.com
+  CYG_CACHE: C:\cygwin\var\cache\setup
+  CYG_BASH: C:\cygwin\bin\bash
   BINTRAY-API-KEY:
     secure: HsNf3W9l3BTI2ZfKHI7pV79hVCIVshmdX//1m2LVOiB2u/Iy0/R9ZOT/RBcP2RpA
   matrix:
@@ -18,7 +22,8 @@ platform:
 clone_depth: 5
 
 install:
-  - cmd: C:\\cygwin\\setup-x86.exe -q -P zip -P mingw64-i686-binutils -P mingw64-i686-gcc-core -P mingw64-i686-gcc-g++ -P mingw64-i686-headers -P mingw64-i686-runtime
+  - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
+  - 'setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P mingw64-i686-gcc-core,mingw64-i686-gcc-g++,mingw64-i686-headers,mingw64-i686-runtime,zip'
 
 build: false
 
@@ -30,11 +35,11 @@ build: false
 # build which causes failures as certain functions attempt to redirect
 # default file handles. Ensure a dummy file descriptor is opened with 'exec'.
 test_script:
-  - cmd: c:\\cygwin\\bin\\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./.travis_build.sh"
+  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./.travis_build.sh"'
 
 # We're using Travis' deployment gem, so we can use the same bintray.json
 on_success:
-  - c:\\cygwin\\bin\\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./.travis_prepare_deployment.sh"
+  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./.travis_prepare_deployment.sh"'
   - SET PATH=C:\\Ruby23\\bin;%PATH%
   - gem install dpl
   - appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem