From c0f7eccf8f8acb2c68af1b88ddba3c6c2999e886 Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Fri, 17 Jun 2016 19:04:02 +0200 Subject: [PATCH 1/4] Disable ARCH="macos64x64" FLAVOR="squeak.sista.spur" (not yet implemented) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39423a4796..7b3946b383 100644 --- a/.travis.yml +++ b/.travis.yml @@ -225,8 +225,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" From 75f543a998993293c8dc4e576134b10b16786a10 Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Fri, 17 Jun 2016 19:13:25 +0200 Subject: [PATCH 2/4] Move linux32ARM builds to end of build matrix as they take longer to build [ci skip] --- .travis.yml | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b3946b383..dce9cb5bb3 100644 --- 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 @@ -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: From 8951b837a404cc40fb6af77e8eca6b4e291116d6 Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Sat, 18 Jun 2016 15:31:09 +0200 Subject: [PATCH 3/4] Re-install cygwin-x86 before using it; should fix flaky builds on AppVeyor --- appveyor.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bb1618fb82..54a74937cc 100644 --- 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' 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 Date: Sat, 18 Jun 2016 15:56:33 +0200 Subject: [PATCH 4/4] Add missing zip packages for AppVeyor builds --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 54a74937cc..ff8e2ae0c9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,7 @@ clone_depth: 5 install: - 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' + - '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