X Tutup
Skip to content

Commit 05f8180

Browse files
author
Johan Brichau
committed
Merge branch 'mergegrease' into 104/Filestreams
2 parents 7c87436 + 154b561 commit 05f8180

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

‎.smalltalk.ston‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ SmalltalkCISpec {
1818
#directory : 'repository',
1919
#onWarningLog : true,
2020
#load : [ 'Tests' ],
21-
#useLatestMetacello : true,
2221
#platforms : [ #gemstone ]
2322
}
2423
]

‎.travis.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ matrix:
99
allow_failures:
1010
- smalltalk: Pharo64-9.0
1111
- smalltalk: Squeak32-trunk
12-
1312
include:
1413
- smalltalk: Pharo64-9.0
1514
env: BUILD_NAME=Pharo64-9.0
@@ -34,10 +33,10 @@ matrix:
3433
env: BUILD_NAME=Squeak-5.2
3534
- smalltalk: Squeak32-5.1
3635
env: BUILD_NAME=Squeak-5.1
37-
- smalltalk: GemStone-3.5.0
38-
env: BUILD_NAME=GemStone-3.5.0
39-
- smalltalk: GemStone-3.4.3
40-
env: BUILD_NAME=GemStone-3.4.3
36+
- smalltalk: GemStone-3.5.2
37+
env: BUILD_NAME=GemStone-3.5.2
38+
- smalltalk: GemStone-3.4.5
39+
env: BUILD_NAME=GemStone-3.4.5
4140
- smalltalk: GemStone-3.3.9
4241
env: BUILD_NAME=GemStone-3.3.9
4342
- smalltalk: GemStone-3.2.17
@@ -46,3 +45,7 @@ matrix:
4645
env: BUILD_NAME=GemStone-3.1.0.6
4746
- smalltalk: GemStone-2.4.8
4847
env: BUILD_NAME=GemStone-2.4.8
48+
49+
notifications:
50+
slack: gemtalksystems:4YWbzy6sJN9cE0FhxvUPP8nS
51+

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ The latest Grease version is supported on the following platforms and versions,
2020

2121
| Squeak | Pharo | GemStone |
2222
| --------------- | ---------------- | -------------------- |
23-
| [![Build status: Squeak-5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-trunk&label=5.2)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.0&label=3.5.0)](http://travis-ci.org/SeasideSt/Grease) |
24-
| [![Build status: Squeak-5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-5.1&label=5.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-7.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-7.0&label=7.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.4.3](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.3&label=3.4.3)](http://travis-ci.org/SeasideSt/Grease) |
23+
| [![Build status: Squeak-5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-trunk&label=5.2)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-8.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-8.0&label=8.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.5.2](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.2&label=3.5.2)](http://travis-ci.org/SeasideSt/Grease) |
24+
| [![Build status: Squeak-5.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Squeak-5.1&label=5.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Pharo64-7.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-7.0&label=7.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.4.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.4.5&label=3.4.5)](http://travis-ci.org/SeasideSt/Grease) |
2525
| | [![Build status: Pharo-6.1](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-6.1&label=6.1)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.3.9](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.3.9&label=3.3.9)](http://travis-ci.org/SeasideSt/Grease) |
2626
| | [![Build status: Pharo-5.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-5.0&label=5.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.2.17](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.2.17&label=3.2.17)](http://travis-ci.org/SeasideSt/Grease) |
2727
| | [![Build status: Pharo-4.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo-4.0&label=4.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.1.0.6](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.1.0.6&label=3.1.0.6)](http://travis-ci.org/SeasideSt/Grease) |

0 commit comments

Comments
 (0)
X Tutup