Skip to content

Commit 7ffdf59

Browse files
Ben ComanBen Coman
Ben Coman
authored and
Ben Coman
committed
Match new SmalltalkCI image names
1 parent c6f3b5a commit 7ffdf59

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎.travis.yml

+23-23
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,30 @@ jobs:
2828
fast_finish: true
2929
include:
3030
- stage: "Main Squeak and Pharo builds"
31-
env: ARCH="linux32x86" FLAVOR="squeak.cog.spur" TESTIMAGE="Squeak-5.1"
32-
- env: ARCH="macos32x86" FLAVOR="squeak.cog.spur" TESTIMAGE="Squeak-5.1"
31+
env: ARCH="linux32x86" FLAVOR="squeak.cog.spur" TESTIMAGE="Squeak32-5.1"
32+
- env: ARCH="macos32x86" FLAVOR="squeak.cog.spur" TESTIMAGE="Squeak32-5.1"
3333
<<: *mac-build
3434
- env: ARCH="linux64x64" FLAVOR="squeak.cog.spur" TESTIMAGE="skip"
3535
- env: ARCH="macos64x64" FLAVOR="squeak.cog.spur" TESTIMAGE="skip"
3636
<<: *mac-build
37-
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" TESTIMAGE="Pharo-5.0" HEARTBEAT="threaded"
38-
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur" TESTIMAGE="Pharo-5.0"
37+
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" TESTIMAGE="Pharo32-5.0" HEARTBEAT="threaded"
38+
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur" TESTIMAGE="Pharo32-5.0"
3939
<<: *mac-build
40-
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" TESTIMAGE="skip" HEARTBEAT="threaded"
40+
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" TESTIMAGE="skip" HEARTBEAT="threaded"
4141
- env: ARCH="macos64x64" FLAVOR="pharo.cog.spur" TESTIMAGE="skip"
4242
<<: *mac-build
4343

4444
- stage: "Other Linux builds"
4545
env: ARCH="linux64x64" FLAVOR="newspeak.cog.spur" TESTIMAGE="skip"
46-
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" TESTIMAGE="skip" HEARTBEAT="itimer"
47-
#-env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" TESTIMAGE="skip" HEARTBEAT="threaded"
46+
- env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" TESTIMAGE="skip" HEARTBEAT="itimer"
47+
#-env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" TESTIMAGE="skip" HEARTBEAT="threaded"
4848
- env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur" TESTIMAGE="refer newspeakBootstrap.sh"
49-
- env: ARCH="linux32x86" FLAVOR="squeak.cog.v3" TESTIMAGE="Squeak-4.6"
49+
- env: ARCH="linux32x86" FLAVOR="squeak.cog.v3" TESTIMAGE="Squeak32-4.6"
5050
- env: ARCH="linux32x86" FLAVOR="squeak.sista.spur" TESTIMAGE="skip"
51-
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" TESTIMAGE="Pharo-5.0" HEARTBEAT="itimer"
52-
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" TESTIMAGE="skip" HEARTBEAT="threaded"
51+
- env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" TESTIMAGE="Pharo32-5.0" HEARTBEAT="itimer"
52+
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" TESTIMAGE="skip" HEARTBEAT="threaded"
5353
compiler: clang
54-
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" TESTIMAGE="skip" HEARTBEAT="itimer"
54+
- env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" TESTIMAGE="skip" HEARTBEAT="itimer"
5555
compiler: clang
5656

5757
- stage: "Other Mac builds"
@@ -67,7 +67,7 @@ jobs:
6767
<<: *mac-build
6868
- env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode" TESTIMAGE="skip"
6969
<<: *mac-build
70-
- env: ARCH="macos32x86" FLAVOR="squeak.cog.v3" TESTIMAGE="Squeak-4.6"
70+
- env: ARCH="macos32x86" FLAVOR="squeak.cog.v3" TESTIMAGE="Squeak32-4.6"
7171
<<: *mac-build
7272
- env: ARCH="macos32x86" FLAVOR="squeak.sista.spur" TESTIMAGE="skip"
7373
<<: *mac-build
@@ -76,8 +76,8 @@ jobs:
7676
env: ARCH="linux64x64" FLAVOR="newspeak.stack.spur" TESTIMAGE="refer newspeakBootstrap.sh"
7777
- env: ARCH="linux64x64" FLAVOR="squeak.stack.spur" TESTIMAGE="skip"
7878
- env: ARCH="linux32x86" FLAVOR="newspeak.stack.spur" TESTIMAGE="refer newspeakBootstrap.sh"
79-
- env: ARCH="linux32x86" FLAVOR="squeak.stack.spur" TESTIMAGE="Squeak-5.1"
80-
- env: ARCH="linux32x86" FLAVOR="squeak.stack.v3" TESTIMAGE="Squeak-4.6"
79+
- env: ARCH="linux32x86" FLAVOR="squeak.stack.spur" TESTIMAGE="Squeak32-5.1"
80+
- env: ARCH="linux32x86" FLAVOR="squeak.stack.v3" TESTIMAGE="Squeak32-4.6"
8181
- env: ARCH="macos64x64" FLAVOR="pharo.stack.spur" TESTIMAGE="skip"
8282
<<: *mac-build
8383
- env: ARCH="macos64x64" FLAVOR="pharo.stack.spur.lowcode" TESTIMAGE="skip"
@@ -88,38 +88,38 @@ jobs:
8888
<<: *mac-build
8989
- env: ARCH="macos64x64" FLAVOR="newspeak.stack.spur" TESTIMAGE="refer newspeakBootstrap.sh"
9090
<<: *mac-build
91-
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur" TESTIMAGE="Pharo-5.0"
91+
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur" TESTIMAGE="Pharo32-5.0"
9292
<<: *mac-build
9393
- env: ARCH="macos32x86" FLAVOR="pharo.stack.spur.lowcode" TESTIMAGE="skip"
9494
<<: *mac-build
95-
- env: ARCH="macos32x86" FLAVOR="squeak.stack.spur" TESTIMAGE="Squeak-5.1"
95+
- env: ARCH="macos32x86" FLAVOR="squeak.stack.spur" TESTIMAGE="Squeak32-5.1"
9696
<<: *mac-build
97-
- env: ARCH="macos32x86" FLAVOR="squeak.stack.v3" TESTIMAGE="Squeak-4.6"
97+
- env: ARCH="macos32x86" FLAVOR="squeak.stack.v3" TESTIMAGE="Squeak32-4.6"
9898
<<: *mac-build
9999

100100
# Don't run tests on ARM (ARM builds already take a long time)
101101
- stage: "linux32ARMv6 builds"
102-
env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi
102+
env: ARCH="linux32ARMv6" FLAVOR="newspeak.cog.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi
103103
-- bash -c "
104104
dist: trusty
105105
group: edge
106-
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi
106+
- env: ARCH="linux32ARMv6" FLAVOR="newspeak.stack.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi
107107
-- bash -c "
108108
dist: trusty
109109
group: edge
110-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi --
110+
- env: ARCH="linux32ARMv6" FLAVOR="squeak.cog.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi --
111111
bash -c "
112112
dist: trusty
113113
group: edge
114-
- env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi --
114+
- env: ARCH="linux32ARMv6" FLAVOR="pharo.cog.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi --
115115
bash -c "
116116
dist: trusty
117117
group: edge
118-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi
118+
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.spur" TESTIMAGE="skip" CHROOT="schroot -p -c rpi
119119
-- bash -c "
120120
dist: trusty
121121
group: edge
122-
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" TESTIMAGE="skip" CHROOT="schroot -p -c rpi --
122+
- env: ARCH="linux32ARMv6" FLAVOR="squeak.stack.v3" TESTIMAGE="skip" CHROOT="schroot -p -c rpi --
123123
bash -c "
124124
dist: trusty
125125
group: edge

‎tests/smalltalkCI.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ unzip -q -o smalltalkCI.zip
4747

4848
pushd smalltalkCI-* > /dev/null
4949

50-
"./run.sh" -s "${TESTIMAGE}" --vm "${VM}" "${STON_CONFIG}"
50+
"./run.sh" -s "${TESTIMAGE}" --vm "${VM}" "${STON_CONFIG}"
5151

5252
popd > /dev/null

0 commit comments

Comments
 (0)