Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IGNORE] Dummy commit to allow test CI build from known base #334

Closed
wants to merge 13 commits into from
Closed
65 changes: 0 additions & 65 deletions .appveyor.yml
Expand Up @@ -4,75 +4,10 @@ environment:
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: squeak.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
MINGW_ARCH: x86_64
- FLAVOR: pharo.cog.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: pharo.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
MINGW_ARCH: x86_64
- FLAVOR: squeak.sista.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: squeak.cog.spur.lowcode
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: squeak.cog.v3
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: squeak.stack.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: squeak.stack.v3
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: pharo.sista.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: pharo.cog.spur.lowcode
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: newspeak.cog.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
- FLAVOR: newspeak.stack.spur
ARCH: win32x86
CYG_ROOT: C:\cygwin
MINGW_ARCH: i686
# - FLAVOR: pharo.sista.spur
# ARCH: win64x64
# CYG_ROOT: C:\cygwin64
# MINGW_ARCH: x86_64
- FLAVOR: newspeak.cog.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
MINGW_ARCH: x86_64
- FLAVOR: squeak.stack.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
MINGW_ARCH: x86_64
- FLAVOR: pharo.stack.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
MINGW_ARCH: x86_64
- FLAVOR: newspeak.stack.spur
ARCH: win64x64
CYG_ROOT: C:\cygwin64
MINGW_ARCH: x86_64


matrix:
fast_finish: true
Expand Down
92 changes: 1 addition & 91 deletions .travis.yml
Expand Up @@ -11,10 +11,6 @@ cache:
- armchroot
- .thirdparty-cache

notifications:
slack:
secure: gyekIJqPdx7SxqpugvtpY5mZSg54oFkFJ+DKBPILtjyI/sDhcSwT9GwY/zoHoYkoHrPLepDxyPgkAC8JCcTiAcxOazq5zlVva6SoQRjlDnC64oCYvOj/2giuYkXLXnwvj8mIINEgXzEvLdalpHwazsY0fzKNFM1mdrkPolmf2CvaNbKCGkiagsjrxJHEEB4tLcUP4ArqVE6wb+20HXoMKlHccgCFvN67bYJrTXDnuhEgKMooQRFv0yVoimckdRn1amvIgljavPwv2yHX+V1roneyi90e4ri9AT2sROeRprGnaib9Z8p+/mgWIUnTLL7pjbNHhtvZptsj3xjanWy1Bt/4MMewTWN4REE/KKxLp79CQvGNR+Ki7mF2UpgYUtxHYpFNIGNF9VomwnfWAuYdGDAYAGY3S1W12RPo37CC7RP/lPM96L6ypW41FoQKlnhzm+StJV+mlI5C1jQBU2WKoVhaKXJpraX2mUJXyN8ilYDo7PrJe0SRLH6J2WwPM5Z/RdscBDEGAR4RhZnn++1IE7e1gZPJB4NZH/3wLBwDhz8S4kB/GB32/rz3ZaftCf2+XjAZXzF3SroUCZ/MWZPGrwchEkU/3z1Tm8FTbELxZk1rSYpdLwVnXYooo5vggqjgAZvmlTerJuufl5lOkXT44PynZAvE+I+MrD04DpKuH0w=

aliases:
- &mac-build
os: osx
Expand All @@ -27,101 +23,15 @@ notifications:
jobs:
fast_finish: true
include:
- stage: "Main Squeak and Pharo builds"
env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
- env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"
<<: *mac-build
- env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
- env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
<<: *mac-build
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
<<: *mac-build
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
<<: *mac-build

- stage: "Other Linux builds"
env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
# - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
- env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
- env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
- env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
compiler: clang
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer"
compiler: clang

- stage: "Other Mac builds"
env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
<<: *mac-build
# - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
# <<: *mac-build
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="squeak.cog.v3"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="squeak.sista.spur"
<<: *mac-build

- stage: "Stack builds"
env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
- env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
- env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
- env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
- env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
- env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
<<: *mac-build
- env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode"
<<: *mac-build
- env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
<<: *mac-build
- env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="squeak.stack.spur"
<<: *mac-build
- env: ARCH="macos32x86" FLAVOR="squeak.stack.v3"
<<: *mac-build

- stage: "linux32ARMv6 builds"
env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
-- bash -c "
dist: trusty
group: edge
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
-- bash -c "
dist: trusty
group: edge
- env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
bash -c "
dist: trusty
group: edge
- env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
bash -c "
dist: trusty
group: edge
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
-- bash -c "
dist: trusty
group: edge
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
bash -c "
dist: trusty
group: edge
allow_failures:
- env: FLAVOR="squeak.sista.spur"
- env: FLAVOR="pharo.sista.spur"
Expand Down
7 changes: 4 additions & 3 deletions build.linux32ARMv6/pharo.cog.spur/build/mvm
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
set -e
set -ex
# PharoVM with VM profiler and threaded heartbeat
INSTALLDIR=phcogspurlinuxhtRPi
# disable build of all dependencies by default because travis build takes too much time then fails.
Expand All @@ -12,7 +12,7 @@ else
THIRDPARTYLIBS=
EXTERNALPLUGINS="plugins.ext"
fi
OPT="-g -O2 -fwrapv -DNDEBUG -DDEBUGVM=0 -DPharoVM"
OPT="-g -O2 -fwrapv -DNDEBUG -DDEBUGVM=0 -DPharoVM -DARM32"

if [ $# -ge 1 ]; then
INSTALLDIR="$1"; shift
Expand Down Expand Up @@ -48,7 +48,8 @@ rm -f vm/sqUnixMain.o # nuke version info
rm -rf ../../../products/$INSTALLDIR
# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks`
make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
set -o pipefail
make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG
productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
productDir=`(cd $productDir;pwd)`
for lib in ${THIRDPARTYLIBS}; do
Expand Down