Skip to content

Commit 95ff4c4

Browse files
dalehenrichdalehenrich
authored
Merge pull request #2 from tukanos/GemStoneUpdate
Thanks man! after this merge, I'll turn on the ci jobs ...
2 parents 5809adb + c6728b0 commit 95ff4c4

File tree

150 files changed

+992
-1308
lines changed

Some content is hidden

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

150 files changed

+992
-1308
lines changed

‎.github/workflows/build.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Unit Tests
2+
3+
on: [push,pull_request,workflow_dispatch]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
strategy:
9+
matrix:
10+
smalltalk: [ Pharo64-7.0, Pharo64-8.0, Pharo64-9.0, Pharo64-10, Pharo64-11, Pharo64-12, Pharo64-13 ]
11+
name: ${{ matrix.smalltalk }}
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Set up Smalltalk CI
15+
uses: hpi-swa/setup-smalltalkCI@v1
16+
with:
17+
smalltalk-image: ${{ matrix.smalltalk }}
18+
- name: Load Image and Run Tests
19+
run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalkci/.unit-tests.ston
20+
env:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
timeout-minutes: 15
23+
- name: Upload coverage to Codecov
24+
uses: codecov/codecov-action@v1
25+
with:
26+
name: ${{matrix.os}}-${{matrix.smalltalk}}
27+
token: ${{ secrets.CODECOV_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: smalltalkCI
2+
3+
on:
4+
push:
5+
pull_request:
6+
branches:
7+
gemstone
8+
schedule:
9+
- cron: "15 2 9 * *" #run job on the 9th day of every month on the 15th minute of the 2nd hour
10+
11+
jobs:
12+
build:
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
os: [ ubuntu-latest ]
17+
smalltalk: [ GemStone64-3.7.2, GemStone64-3.7.4.3 ]
18+
runs-on: ${{ matrix.os }}
19+
name: ${{ matrix.smalltalk }}
20+
steps:
21+
- uses: actions/checkout@v2
22+
- uses: hpi-swa/setup-smalltalkCI@v1
23+
with:
24+
smalltalk-image: ${{ matrix.smalltalk }}
25+
- name: Run tests
26+
run: smalltalkci -s ${{ matrix.smalltalk }}
27+
shell: bash
28+
timeout-minutes: 20
29+
slack-workflow-status:
30+
if: always()
31+
name: Post Workflow Status To Slack
32+
needs:
33+
- build
34+
runs-on: ubuntu-latest
35+
steps:
36+
- name: Slack Workflow Notification
37+
uses: Gamesight/slack-workflow-status@master
38+
with:
39+
repo_token: ${{secrets.GITHUB_TOKEN}}
40+
slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}}
41+
name: 'action run'

‎.smalltalk_gemstone.ston‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SmalltalkCISpec {
2+
#loading : [
3+
SCIMetacelloLoadSpec {
4+
#baseline : 'OrderPreservingDictionary',
5+
#directory : 'filetree',
6+
#load : [ 'Tests' ],
7+
#platforms : [ #gemstone ]
8+
}
9+
]
10+
}

‎.smalltalk_pharo.ston‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SmalltalkCISpec {
2+
#loading : [
3+
SCIMetacelloLoadSpec {
4+
#baseline : 'BitmapCharacterSet',
5+
#directory : 'src',
6+
#load : [ 'Tests' ],
7+
#platforms : [ #pharo ]
8+
}
9+
]
10+
}

‎.smalltalkci/.unit-tests.ston‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
SmalltalkCISpec {
2+
#loading : [
3+
SCIMetacelloLoadSpec {
4+
#baseline : 'OrderPreservingDictionary',
5+
#directory : '../src',
6+
#load : [ 'CI' ],
7+
#platforms : [ #pharo ]
8+
}
9+
],
10+
#testing : {
11+
#coverage : {
12+
#packages : [ 'Collections-OrderPreservingDictionary*' ],
13+
#format: #lcov
14+
}
15+
}
16+
}

‎README.md‎

Lines changed: 18 additions & 5 deletions

‎filetree/BaselineOfOrderPreservingDictionary.package/BaselineOfOrderPreservingDictionary.class/instance/baseline..st‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,49 +5,48 @@ baseline: spec
55
for: #'common'
66
do: [
77
"Packages"
8+
spec package: 'Collections-OrderPreservingDictionary-Base';
9+
package: 'Collections-OrderPreservingDictionary-Tests'
10+
with: [ spec requires: #('Collections-OrderPreservingDictionary-Base') ].
11+
12+
"Groups"
813
spec
9-
package: 'Collections-OrderPreservingDictionary-Core';
10-
package: 'Collections-OrderPreservingDictionary-Tests'
11-
with: [ spec requires: #('Collections-OrderPreservingDictionary-Core') ]. "Groups"
12-
spec
13-
group: 'Core' with: #('Collections-OrderPreservingDictionary-Core');
14+
group: 'Core' with: #('Collections-OrderPreservingDictionary-Base');
1415
group: 'Tests' with: #('Collections-OrderPreservingDictionary-Tests');
1516
group: 'Tools' with: #();
1617
group: 'all' with: #('Core' 'Tools' 'Tests');
1718
group: 'default' with: #('all') ].
1819
spec
1920
for: #'gt'
2021
do: [
21-
spec
22-
package: 'Collections-OrderPreservingDictionary-GTExtensions'
23-
with: [ spec requires: #('Collections-OrderPreservingDictionary-Core') ].
24-
spec
25-
group: 'Tools'
26-
with: #('Collections-OrderPreservingDictionary-GTExtensions') ].
22+
spec package: 'Collections-OrderPreservingDictionary-GTExtensions'
23+
with: [ spec requires: #('Collections-OrderPreservingDictionary-Base') ].
24+
spec group: 'Tools'
25+
with: #('Collections-OrderPreservingDictionary-GTExtensions') ].
2726
spec
2827
for: #(#'gemstone')
2928
do: [
3029
spec
31-
package: 'Collections-OrderPreservingDictionary-Core'
30+
package: 'Collections-OrderPreservingDictionary-Base'
3231
with: [ spec includes: 'Collections-OrderPreservingDictionary-GemStone' ].
3332
spec
3433
package: 'Collections-OrderPreservingDictionary-GemStone'
35-
with: [ spec requires: 'Collections-OrderPreservingDictionary-Core' ] ].
34+
with: [ spec requires: 'Collections-OrderPreservingDictionary-Base' ] ].
3635
spec
37-
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
36+
for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x' #'gs3.7.x')
3837
do: [
3938
spec
40-
package: 'Collections-OrderPreservingDictionary-Core'
39+
package: 'Collections-OrderPreservingDictionary-Base'
4140
with: [ spec includes: 'Collections-OrderPreservingDictionary-GemStone32-' ].
4241
spec
4342
package: 'Collections-OrderPreservingDictionary-GemStone32-'
44-
with: [ spec requires: 'Collections-OrderPreservingDictionary-Core' ] ].
43+
with: [ spec requires: 'Collections-OrderPreservingDictionary-Base' ] ].
4544
spec
4645
for: #'gs3.1.x'
4746
do: [
4847
spec
49-
package: 'Collections-OrderPreservingDictionary-Core'
48+
package: 'Collections-OrderPreservingDictionary-Base'
5049
with: [ spec includes: #('Collections-OrderPreservingDictionary-GemStone31x') ].
5150
spec
5251
package: 'Collections-OrderPreservingDictionary-GemStone31x'
53-
with: [ spec requires: 'Collections-OrderPreservingDictionary-Core' ] ]
52+
with: [ spec requires: 'Collections-OrderPreservingDictionary-Base' ] ]

filetree/Collections-OrderPreservingDictionary-Core.package/.filetree renamed to filetree/Collections-OrderPreservingDictionary-Base.package/.filetree

File renamed without changes.

filetree/Collections-OrderPreservingDictionary-Core.package/Object.extension/instance/isOrderPreservingDictionary.st renamed to filetree/Collections-OrderPreservingDictionary-Base.package/Object.extension/instance/isOrderPreservingDictionary.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*Collections-OrderPreservingDictionary-Core
1+
*Collections-OrderPreservingDictionary-Base
22
isOrderPreservingDictionary
33
"Defined here because not all collections inherit from Collection,
44
so just defining it in Collection and StandardOrderedDictionary

filetree/Collections-OrderPreservingDictionary-Core.package/Object.extension/properties.json renamed to filetree/Collections-OrderPreservingDictionary-Base.package/Object.extension/properties.json

File renamed without changes.

0 commit comments

Comments
 (0)