diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5d861b8..b7d05589 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,17 +3,17 @@ name: smalltalkCI on: [push, pull_request] jobs: - build: + test: runs-on: ubuntu-18.04 strategy: fail-fast: false matrix: - smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, 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 ] + smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, 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 ] experimental: [ false ] include: - smalltalk: Pharo64-11 experimental: true - - smalltalk: Squeak64-trunk + - smalltalk: Squeak64-6.0 experimental: true continue-on-error: ${{ matrix.experimental }} name: ${{ matrix.smalltalk }} @@ -22,8 +22,14 @@ jobs: - uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }} + smalltalkCI-source: 'jbrichau/smalltalkCI' - name: Run tests - id: test_run run: smalltalkci -s ${{ matrix.smalltalk }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash - timeout-minutes: 20 \ No newline at end of file + timeout-minutes: 20 + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 + with: + name: ${{ matrix.smalltalk }} diff --git a/.smalltalk.ston b/.smalltalk.ston index 9edb3f39..e62640ac 100644 --- a/.smalltalk.ston +++ b/.smalltalk.ston @@ -20,5 +20,15 @@ SmalltalkCISpec { #load : [ 'Tests' ], #platforms : [ #gemstone ] } - ] + ], + #testing : { + #defaultTimeout : 30, + #include : { + #classes : [ #SentButNotImplementedTest , #UndefinedSymbolsTest ] + }, + #coverage : { + #packages: [ 'Grease*' ], + #format: #lcov + } + } } diff --git a/README.md b/README.md index bed04f04..c4fa80b6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Grease is widely adopted. Implementations exist already for all platforms that s ## Platform compatibility -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) +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) ## Installation diff --git a/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/stackDepth.st b/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/stackDepth.st index d7e6feab..7b994393 100644 --- a/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/stackDepth.st +++ b/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/stackDepth.st @@ -1,6 +1,6 @@ exceptions stackDepth - + | depth current | depth := 0. current := thisContext. diff --git a/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/thisContext.st b/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/thisContext.st index c936ecad..97018fc5 100644 --- a/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/thisContext.st +++ b/repository/Grease-Pharo100-Core.package/GRPharoPlatform.class/instance/thisContext.st @@ -1,4 +1,4 @@ processes thisContext - + ^ thisContext sender \ No newline at end of file diff --git a/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/stackDepth.st b/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/stackDepth.st index d7e6feab..7b994393 100644 --- a/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/stackDepth.st +++ b/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/stackDepth.st @@ -1,6 +1,6 @@ exceptions stackDepth - + | depth current | depth := 0. current := thisContext. diff --git a/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/thisContext.st b/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/thisContext.st index c936ecad..97018fc5 100644 --- a/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/thisContext.st +++ b/repository/Grease-Pharo60-Core.package/GRPharoPlatform.class/instance/thisContext.st @@ -1,4 +1,4 @@ processes thisContext - + ^ thisContext sender \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/stackDepth.st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/stackDepth.st index d7e6feab..7b994393 100644 --- a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/stackDepth.st +++ b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/stackDepth.st @@ -1,6 +1,6 @@ exceptions stackDepth - + | depth current | depth := 0. current := thisContext. diff --git a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/thisContext.st b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/thisContext.st index c936ecad..97018fc5 100644 --- a/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/thisContext.st +++ b/repository/Grease-Pharo70-Core.package/GRPharoPlatform.class/instance/thisContext.st @@ -1,4 +1,4 @@ processes thisContext - + ^ thisContext sender \ No newline at end of file diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/stackDepth.st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/stackDepth.st index d7e6feab..7b994393 100644 --- a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/stackDepth.st +++ b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/stackDepth.st @@ -1,6 +1,6 @@ exceptions stackDepth - + | depth current | depth := 0. current := thisContext. diff --git a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/thisContext.st b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/thisContext.st index c936ecad..97018fc5 100644 --- a/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/thisContext.st +++ b/repository/Grease-Pharo90-Core.package/GRPharoPlatform.class/instance/thisContext.st @@ -1,4 +1,4 @@ processes thisContext - + ^ thisContext sender \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/stackDepth.st b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/stackDepth.st index d7e6feab..7b994393 100644 --- a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/stackDepth.st +++ b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/stackDepth.st @@ -1,6 +1,6 @@ exceptions stackDepth - + | depth current | depth := 0. current := thisContext. diff --git a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/thisContext.st b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/thisContext.st index c936ecad..97018fc5 100644 --- a/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/thisContext.st +++ b/repository/Grease-Squeak5-Core.package/GRPharoPlatform.class/instance/thisContext.st @@ -1,4 +1,4 @@ processes thisContext - + ^ thisContext sender \ No newline at end of file diff --git a/repository/Grease-Squeak6-Core.package/GRPharoPlatform.class/instance/stackDepth.st b/repository/Grease-Squeak6-Core.package/GRPharoPlatform.class/instance/stackDepth.st index d7e6feab..7b994393 100644 --- a/repository/Grease-Squeak6-Core.package/GRPharoPlatform.class/instance/stackDepth.st +++ b/repository/Grease-Squeak6-Core.package/GRPharoPlatform.class/instance/stackDepth.st @@ -1,6 +1,6 @@ exceptions stackDepth - + | depth current | depth := 0. current := thisContext. diff --git a/repository/Grease-Squeak6-Core.package/GRSqueakPlatform.class/instance/thisContext.st b/repository/Grease-Squeak6-Core.package/GRSqueakPlatform.class/instance/thisContext.st index ed9ce368..360fed0c 100644 --- a/repository/Grease-Squeak6-Core.package/GRSqueakPlatform.class/instance/thisContext.st +++ b/repository/Grease-Squeak6-Core.package/GRSqueakPlatform.class/instance/thisContext.st @@ -1,4 +1,4 @@ processes thisContext - + ^ thisContext sender diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/platform.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/platform.st index fcdd4be5..63cfbfa2 100644 --- a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/platform.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/platform.st @@ -1,3 +1,4 @@ accessing platform + ^ GRPlatform current \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/returnSender.st b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/returnSender.st index 1b25f567..97bd2a26 100644 --- a/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/returnSender.st +++ b/repository/Grease-Tests-Core.package/GRPlatformTest.class/instance/returnSender.st @@ -1,3 +1,4 @@ private returnSender + ^ GRPlatform current thisContext sender \ No newline at end of file diff --git a/repository/Grease-Tests-Core.package/GRPrinterTest.class/class/packageNamesUnderTest.st b/repository/Grease-Tests-Core.package/GRPrinterTest.class/class/packageNamesUnderTest.st deleted file mode 100644 index ffc11f34..00000000 --- a/repository/Grease-Tests-Core.package/GRPrinterTest.class/class/packageNamesUnderTest.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -packageNamesUnderTest - ^ #('Grease-Core') \ No newline at end of file