X Tutup
Skip to content

Commit 5e3339f

Browse files
dalehenrichdalehenrich
authored
Merge pull request SeasideSt#21 from SeasideSt/gsdevkit_merge
Fetch upstream changes for Grease
2 parents 3466bfa + 05b83d7 commit 5e3339f

File tree

12 files changed

+71
-43
lines changed

12 files changed

+71
-43
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,40 @@ jobs:
2020
continue-on-error: ${{ matrix.experimental }}
2121
name: ${{ matrix.smalltalk }}
2222
steps:
23+
- name: Get current date
24+
id: date
25+
run: echo "::set-output name=date::$(date +'%Y-%m-%dT%H:%M:%S')"
26+
- name: Log date
27+
run: echo "${{ steps.date.outputs.date }}"
28+
- name: Set default run status
29+
run: echo "::set-output name=last_run_status::default" > last_run_status
30+
- name: Restore last run status
31+
id: last_run
32+
uses: actions/cache@v2
33+
with:
34+
path: |
35+
last_run_status
36+
key: ${{ github.run_id }}-${{ matrix.smalltalk }}-${{ steps.date.outputs.date }}
37+
restore-keys: |
38+
${{ github.run_id }}-${{ matrix.smalltalk }}-
39+
- name: Set last run status
40+
id: last_run_status
41+
run: cat last_run_status
2342
- uses: actions/checkout@v2
43+
with:
44+
ref: ${{ github.event.workflow_dispatch.ref }}
2445
- uses: hpi-swa/setup-smalltalkCI@v1
2546
with:
2647
smalltalk-image: ${{ matrix.smalltalk }}
27-
- name: Fix missing OS prerequisites for GemStone builds
28-
run: |
29-
git clone https://github.com/GsDevKit/GsDevKit_home.git
30-
./GsDevKit_home/bin/utils/installOsPrereqs
31-
continue-on-error: true
32-
if: startsWith(matrix.smalltalk,'GemStone')
3348
- name: Run tests
49+
id: test_run
50+
if: steps.last_run_status.outputs.last_run_status != 'success'
3451
run: smalltalkci -s ${{ matrix.smalltalk }}
3552
shell: bash
36-
timeout-minutes: 10
53+
timeout-minutes: 20
54+
- name: Save run status
55+
if: steps.last_run_status.outputs.last_run_status != 'success'
56+
run: echo "::set-output name=last_run_status::${{ steps.test_run.outcome }}" > last_run_status
3757
slack-workflow-status:
3858
if: always()
3959
name: Post Workflow Status To Slack

‎README.md‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,9 @@ Grease does not try to solve all problems. We are not testing Sockets or HTTP cl
1616

1717
Grease is widely adopted. Implementations exist already for all platforms that support Seaside 3.x. As well as Seaside, new versions of Magritte, Pier, and Monticello are already being implemented on top of Grease.
1818

19-
## Platform compatibility and Travis builds
19+
## Platform compatibility
2020

21-
The latest Grease version is supported on the following platforms and versions, which are tested using [Travis CI builds](https://travis-ci.org/SeasideSt/Grease):
22-
23-
| Squeak | Pharo | GemStone |
24-
| --------------- | ---------------- | -------------------- |
25-
| [![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-9.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=Pharo64-9.0&label=9.0)](http://travis-ci.org/SeasideSt/Grease) | [![Build status: Gemstone-3.6.0](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.6.0&label=3.6.0)](http://travis-ci.org/SeasideSt/Grease) |
26-
| [![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-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.5](http://badges.herokuapp.com/travis/SeasideSt/Grease?branch=master&env=BUILD_NAME=GemStone-3.5.5&label=3.5.5)](http://travis-ci.org/SeasideSt/Grease) |
27-
| | [![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) |
28-
| | [![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) |
29-
| | | [![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) |
30-
| | | [![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) |
31-
| | | |
32-
33-
Coveralls (experimental): [![Coverage Status](https://coveralls.io/repos/github/SeasideSt/Grease/badge.svg?branch=test-coveralls)](https://coveralls.io/github/SeasideSt/Grease?branch=test-coveralls)
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)
3422

3523
## Installation
3624

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ baselineGemStone: spec
9797
with: [ spec includes: 'Grease-Tests-GemStone-Core' ] ].
9898

9999
spec
100-
for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' )
100+
for: #( #'gs3.5.4.x' #'gs3.5.5.x' #'gs3.5.6.x' #'gs3.5.7.x' )
101101
do: [
102102
spec
103103
package: 'Grease-GemStone-Core'

‎repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/openDebuggerOn..st‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ openDebuggerOn: anError
1111
UnhandledError signalForException: anError ]
1212
ifFalse: [
1313
WorldState addDeferredUIMessage: [
14-
process
15-
debug: anError signalerContext
16-
title: anError description
17-
full: true ].
14+
UIManager default
15+
requestDebuggerOpeningForProcess: process
16+
named: anError description
17+
inContext: anError signalerContext ].
1818
process suspend ]

‎repository/Grease-Pharo90-Core.package/GRSmallDictionary.extension/instance/customizeExplorerContents.st‎

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

‎repository/Grease-Pharo90-Core.package/GRSmallDictionary.extension/instance/explorerContents.st‎

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

‎repository/Grease-Pharo90-Core.package/GRSmallDictionary.extension/instance/hasContentsInExplorer.st‎

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

‎repository/Grease-Pharo90-Core.package/GRSmallDictionary.extension/instance/inspectionItems..st‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*Grease-Pharo90-Core
2+
inspectionItems: aBuilder
3+
<inspectorPresentationOrder: 0 title: 'Items'>
4+
5+
^ aBuilder newTable
6+
addColumn: (SpStringTableColumn
7+
title: 'Key'
8+
evaluated: [ :each | StObjectPrinter asTruncatedTextFrom: each key ])
9+
beSortable;
10+
addColumn: (SpStringTableColumn
11+
title: 'Value'
12+
evaluated: [ :each | StObjectPrinter asTruncatedTextFrom: each value ])
13+
beSortable;
14+
items: self associations;
15+
yourself

‎repository/Grease-Pharo90-Core.package/GRSmallDictionary2.extension/instance/inspectionItems..st‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
*Grease-Pharo90-Core
2+
inspectionItems: aBuilder
3+
<inspectorPresentationOrder: 0 title: 'Items'>
4+
5+
^ aBuilder newTable
6+
addColumn: (SpStringTableColumn
7+
title: 'Key'
8+
evaluated: [ :each | StObjectPrinter asTruncatedTextFrom: each key ])
9+
beSortable;
10+
addColumn: (SpStringTableColumn
11+
title: 'Value'
12+
evaluated: [ :each | StObjectPrinter asTruncatedTextFrom: each value ])
13+
beSortable;
14+
items: self associations;
15+
yourself

‎repository/Grease-Pharo90-Core.package/GRSmallDictionary2.extension/properties.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name" : "GRSmallDictionary2"
3+
}

0 commit comments

Comments
 (0)
X Tutup