Skip to content

Commit

Permalink
Reorder the appveyor matrix so as to put main Squeak/Pharo build first
Browse files Browse the repository at this point in the history
While at it, add -L flag to curl so as to follow redirection
  • Loading branch information
nicolas-cellier-aka-nice committed Apr 2, 2018
1 parent 3249967 commit 1b0f7d2
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions .appveyor.yml
Expand Up @@ -3,37 +3,47 @@ environment:
BINTRAYAPIKEY:
secure: uknPzww818XWJiLecwur9p1MfrkACOyx9d3iNrw/TuD89EoPSc8zLqKdPZjWdcQd
matrix:
- FLAVOR: squeak.sista.spur
- FLAVOR: squeak.cog.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
- FLAVOR: pharo.cog.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.cog.spur.lowcode
- FLAVOR: pharo.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
- FLAVOR: squeak.sista.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.cog.v3
- FLAVOR: squeak.cog.spur.lowcode
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.stack.spur
- FLAVOR: squeak.cog.v3
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.stack.v3
- FLAVOR: squeak.stack.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: pharo.cog.spur
- FLAVOR: squeak.stack.v3
ARCH: win32x86
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
Expand All @@ -58,16 +68,6 @@ environment:
CYG_ROOT: C:\cygwin
CYG_SETUP: setup-x86.exe
MINGW_ARCH: i686
- FLAVOR: squeak.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
- FLAVOR: pharo.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
CYG_SETUP: setup-x86_64.exe
MINGW_ARCH: x86_64
# - FLAVOR: pharo.sista.spur
# ARCH: win64x64
# CYG_ROOT: C:\cygwin64
Expand Down Expand Up @@ -113,8 +113,8 @@ cache:
- .thirdparty-cache

install:
- 'curl -fsS --retry 4 -m 600 -o "setup-x86.exe" "http://cygwin.com/setup-x86.exe" '
- 'curl -fsS --retry 4 -m 600 -o "setup-x86_64.exe" "http://cygwin.com/setup-x86_64.exe" '
- 'curl -fsSL --retry 4 -m 600 -o "setup-x86.exe" "http://cygwin.com/setup-x86.exe" '
- 'curl -fsSL --retry 4 -m 600 -o "setup-x86_64.exe" "http://cygwin.com/setup-x86_64.exe" '
- '%CYG_SETUP% -dgnqNO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip,mingw64-%MINGW_ARCH%-clang,mingw64-%MINGW_ARCH%-openssl,libiconv-devel,libglib2.0-devel,perl,mingw64-%MINGW_ARCH%-zlib,make,cmake,wget,mingw64-%MINGW_ARCH%-win-iconv'

# Cygwin build script
Expand Down

0 comments on commit 1b0f7d2

Please sign in to comment.