Skip to content

Commit dd56a53

Browse files
author
Johan Brichau
authored
Merge pull request #27 from SeasideSt/master
Keep GsDevKit fork in sync with SeasideSt master
2 parents fbb749f + 05a6c4e commit dd56a53

File tree

189 files changed

+404
-326
lines changed

Some content is hidden

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

189 files changed

+404
-326
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,34 @@
11
name: smalltalkCI
22

3-
on:
4-
push:
5-
pull_request:
6-
branches:
7-
master
8-
schedule:
9-
- cron: "15 2 7 * *" #run job on the 7th day of every month on the 15th minute of the 2nd hour
3+
on: [push, pull_request]
104

115
jobs:
12-
build:
6+
test:
137
runs-on: ubuntu-20.04
148
strategy:
9+
fail-fast: false
1510
matrix:
16-
smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.6.5, GemStone64-3.5.8, 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.7.0, GemStone64-3.6.5, GemStone64-3.5.7, Squeak64-5.3 ]
1712
experimental: [ false ]
1813
include:
19-
- smalltalk: Pharo64-11
14+
- smalltalk: Pharo64-12
2015
experimental: true
21-
- smalltalk: Squeak64-trunk
16+
- smalltalk: Squeak64-6.0
2217
experimental: true
2318
continue-on-error: ${{ matrix.experimental }}
2419
name: ${{ matrix.smalltalk }}
2520
steps:
26-
- name: Get current date
27-
id: date
28-
run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%S')"
29-
- name: Log date
30-
run: echo "${{ steps.date.outputs.date }}"
31-
- name: Set default run status
32-
run: echo "::set-output name=last_run_status::default" > last_run_status
33-
- name: Restore last run status
34-
id: last_run
35-
uses: actions/cache@v2
36-
with:
37-
path: |
38-
last_run_status
39-
key: ${{ github.run_id }}-${{ matrix.smalltalk }}-${{ steps.date.outputs.date }}
40-
restore-keys: |
41-
${{ github.run_id }}-${{ matrix.smalltalk }}-
42-
- name: Set last run status
43-
id: last_run_status
44-
run: cat last_run_status
45-
- uses: actions/checkout@v2
46-
with:
47-
ref: ${{ github.event.workflow_dispatch.ref }}
21+
- uses: actions/checkout@v3
4822
- uses: hpi-swa/setup-smalltalkCI@v1
4923
with:
5024
smalltalk-image: ${{ matrix.smalltalk }}
5125
- name: Run tests
52-
id: test_run
53-
if: steps.last_run_status.outputs.last_run_status != 'success'
5426
run: smalltalkci -s ${{ matrix.smalltalk }}
27+
env:
28+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5529
shell: bash
5630
timeout-minutes: 20
57-
- name: Save run status
58-
if: steps.last_run_status.outputs.last_run_status != 'success'
59-
run: echo "::set-output name=last_run_status::${{ steps.test_run.outcome }}" > last_run_status
60-
slack-workflow-status:
61-
if: always()
62-
name: Post Workflow Status To Slack
63-
needs:
64-
- build
65-
runs-on: ubuntu-20.04
66-
steps:
67-
- name: Slack Workflow Notification
68-
uses: Gamesight/slack-workflow-status@master
69-
with:
70-
repo_token: ${{secrets.GITHUB_TOKEN}}
71-
slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}}
72-
name: 'action run'
31+
- name: Upload coverage to Codecov
32+
uses: codecov/codecov-action@v3
33+
with:
34+
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
}

‎.travis.yml_unused‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
[![Build Status](https://github.com/GsDevKit/Grease/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/GsDevKit/Grease/actions/workflows/ci.yml)
2-
31
**IMPORTANT**: Since version 1.3.0, this is the main repository of Grease. Versions older than 1.1.9 can only be found in the [Smalltalkhub repository](http://www.smalltalkhub.com/#!/~Seaside/Grease11). Check out the [releases list](https://github.com/SeasideSt/Grease/releases) for all version numbers in this repository.
42

53
The Grease Portability Library
@@ -18,7 +16,7 @@ Grease is widely adopted. Implementations exist already for all platforms that s
1816

1917
## Platform compatibility
2018

21-
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)
2220

2321
## Installation
2422

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
baselines
22
baselinePharo: spec
3-
3+
44
spec
55
for: #'pharo6.x'
66
do: [ spec
@@ -25,7 +25,7 @@ baselinePharo: spec
2525

2626
spec
2727
for: #(#'pharo6.x' #'pharo7.x' #'pharo8.x')
28-
do: [
28+
do: [
2929
spec
3030
package: 'Grease-Pharo40-Slime' with: [ spec requires: #('Grease-Core') ];
3131
package: 'Grease-Tests-Slime' with: [ spec requires: #('Grease-Pharo40-Slime') ].
@@ -35,7 +35,7 @@ baselinePharo: spec
3535

3636
spec
3737
for: #(#'pharo9.x')
38-
do: [
38+
do: [
3939
spec
4040
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo90-Core') ];
4141
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
@@ -50,10 +50,10 @@ baselinePharo: spec
5050
spec
5151
group: 'Slime' with: #('Grease-Pharo90-Slime');
5252
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
53-
53+
5454
spec
55-
for: #(#'pharo10.x')
56-
do: [
55+
for: #(#'pharo10.x' #'pharo11.x' #'pharo12.x')
56+
do: [
5757
spec
5858
package: 'Grease-Core' with: [ spec includes: #('Grease-Pharo100-Core') ];
5959
package: 'Grease-Tests-Pharo-Core' with: [ spec requires: #('Grease-Tests-Core') ];
@@ -67,4 +67,4 @@ baselinePharo: spec
6767

6868
spec
6969
group: 'Slime' with: #('Grease-Pharo90-Slime');
70-
group: 'Slime Tests' with: #('Grease-Tests-Slime') ].
70+
group: 'Slime Tests' with: #('Grease-Tests-Slime') ]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
SystemOrganization addCategory: #'BaselineOfGrease'!
1+
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

0 commit comments

Comments
 (0)