Skip to content

Commit 9cc1b26

Browse files
JurajKubelkaJurajKubelka
authored
Merge pull request #2 from feenkcom/master
Pull changes from SeasideSt/Grease
2 parents c3722c5 + d0270d7 commit 9cc1b26

File tree

238 files changed

+581
-309
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+581
-309
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,30 @@ name: smalltalkCI
33
on: [push, pull_request]
44

55
jobs:
6-
build:
7-
runs-on: ubuntu-18.04
6+
test:
7+
runs-on: ubuntu-20.04
88
strategy:
99
fail-fast: false
1010
matrix:
11-
smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo-6.1, GemStone64-3.6.3, GemStone64-3.5.7, GemStone64-3.4.5, GemStone64-3.3.9, GemStone64-3.2.17, GemStone64-3.1.0.6, Squeak64-5.3, Squeak64-5.2, Squeak64-5.1 ]
11+
smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.6.5, GemStone64-3.5.7, Squeak64-5.3 ]
1212
experimental: [ false ]
1313
include:
14-
- smalltalk: Squeak64-trunk
14+
- smalltalk: Squeak64-6.0
1515
experimental: true
1616
continue-on-error: ${{ matrix.experimental }}
1717
name: ${{ matrix.smalltalk }}
1818
steps:
19-
- name: Get current date
20-
id: date
21-
run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%S')"
22-
- name: Log date
23-
run: echo "${{ steps.date.outputs.date }}"
24-
- name: Set default run status
25-
run: echo "::set-output name=last_run_status::default" > last_run_status
26-
- name: Restore last run status
27-
id: last_run
28-
uses: actions/cache@v2
29-
with:
30-
path: |
31-
last_run_status
32-
key: ${{ github.run_id }}-${{ matrix.smalltalk }}-${{ steps.date.outputs.date }}
33-
restore-keys: |
34-
${{ github.run_id }}-${{ matrix.smalltalk }}-
35-
- name: Set last run status
36-
id: last_run_status
37-
run: cat last_run_status
38-
- uses: actions/checkout@v2
39-
with:
40-
ref: ${{ github.event.workflow_dispatch.ref }}
41-
- uses: hpi-swa/setup-smalltalkCI@v1
19+
- uses: actions/checkout@v3
20+
- uses: dalehenrich/setup-smalltalkCI@solo
4221
with:
4322
smalltalk-image: ${{ matrix.smalltalk }}
4423
- name: Run tests
45-
id: test_run
46-
if: steps.last_run_status.outputs.last_run_status != 'success'
4724
run: smalltalkci -s ${{ matrix.smalltalk }}
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4827
shell: bash
4928
timeout-minutes: 20
50-
- name: Save run status
51-
if: steps.last_run_status.outputs.last_run_status != 'success'
52-
run: echo "::set-output name=last_run_status::${{ steps.test_run.outcome }}" > last_run_status
29+
- name: Upload coverage to Codecov
30+
uses: codecov/codecov-action@v3
31+
with:
32+
name: ${{ matrix.smalltalk }}

‎.smalltalk.ston‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,15 @@ SmalltalkCISpec {
2020
#load : [ 'Tests' ],
2121
#platforms : [ #gemstone ]
2222
}
23-
]
23+
],
24+
#testing : {
25+
#defaultTimeout : 30,
26+
#include : {
27+
#classes : [ #SentButNotImplementedTest , #UndefinedSymbolsTest ]
28+
},
29+
#coverage : {
30+
#packages: [ 'Grease*' ],
31+
#format: #lcov
32+
}
33+
}
2434
}

‎LICENSE.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# MIT License
2+
3+
Copyright © 2001 –- 2009 Avi Bryant, Julian Fitzell
4+
Copyright © 2007 –- 2009 Lukas Renggli, Michel Bany, Philippe Marschall
5+
Copyright © Seaside Contributors https://github.com/SeasideSt/Seaside/wiki/Contributors
6+
7+
Permission is hereby granted, free of charge, to any person obtaining a copy of
8+
this software and associated documentation files (the "Software"), to deal in
9+
the Software without restriction, including without limitation the rights to
10+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
11+
the Software, and to permit persons to whom the Software is furnished to do so,
12+
subject to the following conditions:
13+
14+
The above copyright notice and this permission notice shall be included in all
15+
copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
19+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
20+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
21+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
22+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
23+
24+

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Grease is widely adopted. Implementations exist already for all platforms that s
1616

1717
## Platform compatibility
1818

19-
The latest Grease version is supported on the Pharo and GemStone/S platforms and versions tested in the SmalltalkCI workflow in Github Actions: [![smalltalkCI](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml)
19+
The latest Grease version is supported on the Pharo and GemStone/S platforms and versions tested in the SmalltalkCI workflow in Github Actions: [![smalltalkCI](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/SeasideSt/Grease/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/SeasideSt/Grease/branch/master/graph/badge.svg?token=75NIYAHAGI)](https://codecov.io/gh/SeasideSt/Grease)
2020

2121
## Installation
2222

‎repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baselinePharo..st‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
baselines
22
baselinePharo: spec
33

4-
spec
5-
for: #(#'pharo5.x')
6-
do: [ spec
7-
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo30-Core') ];
8-
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
9-
package: 'Grease-Tests-Core'
10-
with: [ spec
11-
requires: #('Grease-Pharo30-Core');
12-
includes: #('Grease-Tests-Pharo-Core') ];
13-
package: 'Grease-Pharo30-Core' with: [ spec requires: #('Grease-Core') ] ].
14-
154
spec
165
for: #'pharo6.x'
176
do: [ spec
@@ -36,7 +25,7 @@ baselinePharo: spec
3625

3726
spec
3827
for: #(#'pharo6.x' #'pharo7.x' #'pharo8.x')
39-
do: [
28+
do: [
4029
spec
4130
package: 'Grease-Pharo40-Slime' with: [ spec requires: #('Grease-Core') ];
4231
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo40-Slime') ].
@@ -46,7 +35,7 @@ baselinePharo: spec
4635

4736
spec
4837
for: #(#'pharo9.x')
49-
do: [
38+
do: [
5039
spec
5140
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo90-Core') ];
5241
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
@@ -61,10 +50,10 @@ baselinePharo: spec
6150
spec
6251
group: 'Slime' with: #('Grease-Pharo90-Slime');
6352
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
64-
53+
6554
spec
66-
for: #(#'pharo10.x')
67-
do: [
55+
for: #(#'pharo10.x' #'pharo11.x')
56+
do: [
6857
spec
6958
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo100-Core') ];
7059
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
@@ -78,4 +67,4 @@ baselinePharo: spec
7867

7968
spec
8069
group: 'Slime' with: #('Grease-Pharo90-Slime');
81-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
70+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]

‎repository/BaselineOfGrease.package/monticello.meta/categories.st‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
SystemOrganization addCategory: #BaselineOfGrease!
2+
SystemOrganization addCategory: #'BaselineOfGrease-Manifest'!

‎repository/Grease-Core.package/GRCodec.class/class/forEncoding..st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ instance creation
22
forEncoding: aString
33
"Answer a new codec instance for the given encoding name. Raise an WAUnsupportedEncodingError if the encoding name is not supported by this image."
44

5-
self allSubclassesDo: [ :each |
5+
self allSubclassesDo: [ :each |
66
(each supportsEncoding: aString)
77
ifTrue: [ ^ each basicForEncoding: aString ] ].
88
^ self unsupportedEncoding: aString

‎repository/Grease-Core.package/GRCodec.class/instance/decoderFor..st‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
conversion
22
decoderFor: aReadStream
3-
"Wrap aReadStream with an decoder for the codec of the receiver. Answer a read stream that delegates to and shares the state of aReadStream."
4-
3+
"Wrap aReadStream with an decoder for the codec of the receiver. Answer a read stream that delegates to and shares the state of aReadStream."
4+
55
self subclassResponsibility

‎repository/Grease-Core.package/GRCodec.class/instance/encoderFor..st‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
conversion
22
encoderFor: aWriteStream
33
"Wrap aWriteStream with an encoder for the codec of the receiver. Answer a write stream that delegates to and shares the state of aWriteStream."
4-
4+
55
self subclassResponsibility

‎repository/Grease-Core.package/GRDelayedSend.class/class/receiver.selector..st‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
instance creation
2-
receiver: anObject selector: aSymbol
3-
^ self basicNew
2+
receiver: anObject selector: aSymbol
3+
^ self basicNew
44
initializeWithReceiver: anObject
55
message: (GRUnboundMessage selector: aSymbol);
66
yourself

0 commit comments

Comments
 (0)