Skip to content

Commit 5d7b16e

Browse files
kronokrono
authored
Merge a069745 into 1614d95 
2 parents 1614d95 + a069745 commit 5d7b16e

File tree

3 files changed

+51
-36
lines changed

3 files changed

+51
-36
lines changed

‎.travis.yml‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ jobs:
2424
fast_finish: true
2525
include:
2626
- stage: "Linux builds"
27-
env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
28-
- env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
27+
env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
2928
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
3029
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
3130
# - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
@@ -39,18 +38,14 @@ jobs:
3938
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="itimer"
4039

4140
- stage: "Mac builds"
42-
env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
43-
<<: *mac-build
44-
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
41+
env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
4542
<<: *mac-build
4643
# - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
4744
# <<: *mac-build
4845
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
4946
<<: *mac-build
5047
- env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
5148
<<: *mac-build
52-
- env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
53-
<<: *mac-build
5449
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
5550
<<: *mac-build
5651
- env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
@@ -65,9 +60,7 @@ jobs:
6560
<<: *mac-build
6661

6762
- stage: "Stack builds"
68-
env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
69-
- env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
70-
- env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
63+
env: ARCH="linux64x64" FLAVOR="squeak.stack.spur"
7164
- env: ARCH="linux32x86" FLAVOR="squeak.stack.spur"
7265
- env: ARCH="linux32x86" FLAVOR="squeak.stack.v3"
7366
- env: ARCH="macos64x64" FLAVOR="pharo.stack.spur"
@@ -76,10 +69,6 @@ jobs:
7669
<<: *mac-build
7770
- env: ARCH="macos64x64" FLAVOR="squeak.stack.spur"
7871
<<: *mac-build
79-
- env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
80-
<<: *mac-build
81-
- env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
82-
<<: *mac-build
8372
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur"
8473
<<: *mac-build
8574
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode"
@@ -90,30 +79,47 @@ jobs:
9079
<<: *mac-build
9180

9281
- stage: "linux32ARMv6 builds"
93-
env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi
94-
-- bash -c "
82+
env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
9583
dist: trusty
9684
group: edge
97-
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi
98-
-- bash -c "
85+
- env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
9986
dist: trusty
10087
group: edge
101-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" CHROOT="schroot -p -c rpi --
102-
bash -c "
88+
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi -- bash -c "
10389
dist: trusty
10490
group: edge
105-
- env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" CHROOT="schroot -p -c rpi --
106-
bash -c "
91+
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi -- bash -c "
10792
dist: trusty
10893
group: edge
109-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" CHROOT="schroot -p -c rpi
110-
-- bash -c "
94+
95+
- stage: "Newspeak"
96+
env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
97+
- env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
98+
<<: *mac-build
99+
- env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
100+
<<: *mac-build
101+
- env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
102+
- env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
103+
- env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
104+
<<: *mac-build
105+
- env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
106+
<<: *mac-build
107+
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
111108
dist: trusty
112109
group: edge
113-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" CHROOT="schroot -p -c rpi --
114-
bash -c "
110+
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi -- bash -c "
115111
dist: trusty
116112
group: edge
113+
allow_failures:
114+
- env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur"
115+
- env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
116+
- env: ARCH="macos32x86" FLAVOR="newspeak.cog.spur"
117+
- env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur"
118+
- env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur"
119+
- env: ARCH="macos32x86" FLAVOR="newspeak.stack.spur"
120+
- env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur"
121+
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" CHROOT="schroot -p -c rpi -- bash -c "
122+
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" CHROOT="schroot -p -c rpi -- bash -c "
117123

118124
install: ./.travis_install.sh
119125

‎.travis_build.sh‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,27 @@ build_linux_in() {
6262
}
6363

6464
build_linux() {
65+
# accound for buggy gcc-4.8
66+
if command -v gcc-6 2>&1 >/dev/null; then
67+
export CC=gcc-6
68+
export CXX=g++-6
69+
fi
6570
travis_fold start 'unix_configure' 'Running "make config" in platforms/unix/config ...'
6671
(cd platforms/unix/config/ && make configure)
6772
travis_fold end 'unix_configure'
6873

69-
# build will include both, threaded and itimer version unless
70-
# HEARTBEAT variable is set, in which case just one of both
71-
# will be built.
72-
# HEARTBEAT can be "threaded" or "itimer"
74+
# build will include both, threaded and itimer version unless
75+
# HEARTBEAT variable is set, in which case just one of both
76+
# will be built.
77+
# HEARTBEAT can be "threaded" or "itimer"
7378

74-
if [ -z "$HEARTBEAT" ] || [ "$HEARTBEAT" = "threaded" ]; then
75-
build_linux_in "${BUILD_DIRECTORY}/build" "build_vm"
76-
fi
79+
if [ -z "$HEARTBEAT" ] || [ "$HEARTBEAT" = "threaded" ]; then
80+
build_linux_in "${BUILD_DIRECTORY}/build" "build_vm"
81+
fi
7782

7883
# Also build VM with itimerheartbeat if available
7984
if [[ ! -d "${BUILD_DIRECTORY}/build.itimerheartbeat" ]]; then
80-
return
85+
return
8186
fi
8287

8388
if [ -z "$HEARTBEAT" ] || [ "$HEARTBEAT" = "itimer" ]; then

‎.travis_install.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
set -e
22

33
if [[ "${ARCH}" = "linux64x64" ]]; then
4+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
5+
sudo apt-get update -qq
6+
sudo apt-get install -yq --force-yes g++-6 gcc-6-multilib
47
sudo apt-get install -yq --no-install-suggests --no-install-recommends --force-yes \
58
debhelper \
69
devscripts \
@@ -13,10 +16,12 @@ if [[ "${ARCH}" = "linux64x64" ]]; then
1316
libpango1.0-dev \
1417
libpulse-dev \
1518
libaudio-dev \
16-
gcc-multilib \
1719
uuid-dev
1820
elif [[ "${ARCH}" = "linux32x86" ]]; then
1921
sudo apt-get remove -q -y gvfs-daemons
22+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
23+
sudo apt-get update -qq
24+
sudo apt-get install -yq --force-yes g++-6 gcc-6-multilib
2025
sudo apt-get install -yq --no-install-suggests --no-install-recommends --force-yes \
2126
devscripts \
2227
libc6-dev:i386 \
@@ -41,7 +46,6 @@ elif [[ "${ARCH}" = "linux32x86" ]]; then
4146
libgirepository-1.0-1:i386 \
4247
libpulse-dev:i386 \
4348
libaudio-dev:i386 \
44-
gcc-multilib \
4549
uuid-dev:i386 \
4650
libcurl3-dev:i386
4751
fi

0 commit comments

Comments
 (0)