From d288e12149db77d0c938bd8ad6f66ed07f699ac8 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Fri, 22 Sep 2023 19:51:07 +0200 Subject: [PATCH 01/18] CI changes for gsdevkit --- .github/workflows/ci.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77a2aed7..6a23de3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,12 @@ name: smalltalkCI -on: [push, pull_request] +on: + push: + pull_request: + branches: + master + schedule: + - cron: "15 2 7 * *" #run job on the 7th day of every month on the 15th minute of the 2nd hour jobs: test: @@ -32,3 +38,9 @@ jobs: uses: codecov/codecov-action@v3 with: name: ${{ matrix.smalltalk }} + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}} + name: 'action run' From 19b3967518c3689b468340e14931629760c79c14 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Apr 2024 16:29:32 -0700 Subject: [PATCH 02/18] GRPlatformtest>>writeToFile:withFileNameDo: had incorrect filename --- ...iteToFile.withFileNameDo.st => writeToFile.withFileNameDo..st} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/{writeToFile.withFileNameDo.st => writeToFile.withFileNameDo..st} (100%) diff --git a/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st b/repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st similarity index 100% rename from repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo.st rename to repository/Grease-Tests-GemStone32-Core.package/GRPlatformTest.extension/instance/writeToFile.withFileNameDo..st From d7b88fe7b3dff2d3c69abafa34c1029cd436d060 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Apr 2024 16:38:49 -0700 Subject: [PATCH 03/18] update the lineup for 3.6.8 and 3.5.8 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a23de3b..962479a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - 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 ] + smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-5.3 ] experimental: [ false ] include: - smalltalk: Pharo64-12 From 2b63a9058f2f90280e107c1720505e785546582a Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 12 Aug 2024 11:24:22 -0700 Subject: [PATCH 04/18] update to for 3.7.1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 962479a8..16097806 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-5.3 ] + smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-5.3 ] experimental: [ false ] include: - smalltalk: Pharo64-12 From 12d2cf17a3804376c2f4716a98d8d1c15351c45d Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 12 Aug 2024 15:57:01 -0700 Subject: [PATCH 05/18] Issue #32: wire out the GRPackageTest>>testPackages test. The test fails in the presence of Seaside since, Seaside doesn't define the 'required methods' anymore --- .../GRPackageTest.class/instance/testPackages.st | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st b/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st index 3c074d00..c0ff7531 100644 --- a/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st +++ b/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st @@ -1,10 +1,15 @@ tests-packages testPackages | packages | + true + ifTrue: [ + "GRPackage appears to no longer be supported" + "https://github.com/GsDevKit/Grease/issues/32" + ^self ]. packages := GRPackage grPackages. self assert: packages notEmpty. packages do: [ :each | self assert: each name notEmpty. self assert: each license notNil. self deny: (each dependencies includes: nil). - self assert: each url notNil ]. \ No newline at end of file + self assert: each url notNil ]. From 02e0f273fc26358da65c5d3b3a139a1bde918619 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Tue, 13 Aug 2024 08:46:36 -0700 Subject: [PATCH 06/18] With this fix to Seaside (SeasideSt/Seaside#1441), the patch for #32 is no longer necessary ..revert "Issue #32: wire out the GRPackageTest>>testPackages test. The test fails in the presence of Seaside since, Seaside doesn't define the 'required methods' anymore" This reverts commit 12d2cf17a3804376c2f4716a98d8d1c15351c45d. --- .../GRPackageTest.class/instance/testPackages.st | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st b/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st index c0ff7531..3c074d00 100644 --- a/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st +++ b/repository/Grease-Tests-Core.package/GRPackageTest.class/instance/testPackages.st @@ -1,15 +1,10 @@ tests-packages testPackages | packages | - true - ifTrue: [ - "GRPackage appears to no longer be supported" - "https://github.com/GsDevKit/Grease/issues/32" - ^self ]. packages := GRPackage grPackages. self assert: packages notEmpty. packages do: [ :each | self assert: each name notEmpty. self assert: each license notNil. self deny: (each dependencies includes: nil). - self assert: each url notNil ]. + self assert: each url notNil ]. \ No newline at end of file From 1c70803aa874078319b2198a463f3f26ee6de3c6 Mon Sep 17 00:00:00 2001 From: Kurt Kilpela Date: Fri, 16 Aug 2024 09:33:19 -0700 Subject: [PATCH 07/18] #33 Add missing #greaseNext:putAll:startingAt: method --- .../instance/greaseNext.putAll.startingAt..st | 3 +++ .../GRDelegatingStream.extension/properties.json | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/instance/greaseNext.putAll.startingAt..st create mode 100644 repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/properties.json diff --git a/repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/instance/greaseNext.putAll.startingAt..st b/repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/instance/greaseNext.putAll.startingAt..st new file mode 100644 index 00000000..7ebc0caa --- /dev/null +++ b/repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/instance/greaseNext.putAll.startingAt..st @@ -0,0 +1,3 @@ +*grease-gemstone-core +greaseNext: anInteger putAll: aCollection startingAt: startIndex + stream greaseNext: anInteger putAll: aCollection startingAt: startIndex diff --git a/repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/properties.json b/repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/properties.json new file mode 100644 index 00000000..5ec29ea0 --- /dev/null +++ b/repository/Grease-GemStone-Core.package/GRDelegatingStream.extension/properties.json @@ -0,0 +1,3 @@ +{ + "name" : "GRDelegatingStream" +} \ No newline at end of file From 96660afaf2bc078a09be3f6979f2bef38c00868f Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 10:01:05 -0800 Subject: [PATCH 08/18] Issue #37: first cut to update ci.yml and revive CI jogs on github --- .github/workflows/ci.yml | 41 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d7551d0..a399ecd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,38 +10,31 @@ on: jobs: test: - runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: - smalltalk: [ Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-5.3 ] - experimental: [ false ] - include: - - smalltalk: Pharo64-13 - experimental: true - - smalltalk: Squeak64-6.0 - experimental: true - continue-on-error: ${{ matrix.experimental }} - name: ${{ matrix.smalltalk }} + os: [ ubuntu-22.04, ubuntu-24.04, macos-latest] + smalltalk: [ GemStone64-3.7.2, GemStone64-3.7.1, GemStone64-3.6.8 ] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: hpi-swa/setup-smalltalkCI@v1 + - uses: hpi-swa/setup-smalltalkCI@solo with: smalltalk-image: ${{ matrix.smalltalk }} - name: Run tests run: smalltalkci -s ${{ matrix.smalltalk }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} shell: bash timeout-minutes: 20 - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - name: ${{ matrix.smalltalk }} - token: ${{ secrets.CODECOV_TOKEN }} - - name: Slack Workflow Notification - uses: Gamesight/slack-workflow-status@master - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}} - name: 'action run' + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: + -test + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}} + name: 'action run' From 4dad72f632c1b471d852fdef3a4d9a6451a2db2a Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 10:05:31 -0800 Subject: [PATCH 09/18] Issue #37: yml --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a399ecd6..80772009 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,16 +25,16 @@ jobs: run: smalltalkci -s ${{ matrix.smalltalk }} shell: bash timeout-minutes: 20 - slack-workflow-status: - if: always() - name: Post Workflow Status To Slack - needs: - -test - runs-on: ubuntu-latest - steps: - - name: Slack Workflow Notification - uses: Gamesight/slack-workflow-status@master - with: - repo_token: ${{secrets.GITHUB_TOKEN}} - slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}} - name: 'action run' + slack-workflow-status: + if: always() + name: Post Workflow Status To Slack + needs: + -test + runs-on: ubuntu-latest + steps: + - name: Slack Workflow Notification + uses: Gamesight/slack-workflow-status@master + with: + repo_token: ${{secrets.GITHUB_TOKEN}} + slack_webhook_url: ${{secrets.SLACK_DALEHENRICH}} + name: 'action run' From 3bb23ecc455246f61a2e71881c8dd4852df45c33 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 10:15:51 -0800 Subject: [PATCH 10/18] Issue #37: yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80772009..6ad1152d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: if: always() name: Post Workflow Status To Slack needs: - -test + - test runs-on: ubuntu-latest steps: - name: Slack Workflow Notification From 02135d7d159201ee44416f46d15ef86074f52d9d Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 10:18:31 -0800 Subject: [PATCH 11/18] Issue #37: yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ad1152d..10e303da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: hpi-swa/setup-smalltalkCI@solo + - uses: dalehenrich/setup-smalltalkCI@solo with: smalltalk-image: ${{ matrix.smalltalk }} - name: Run tests From 05a6b6be6f58b1c769cbac0d56825d46117d6b0e Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 10:26:41 -0800 Subject: [PATCH 12/18] Issue #37: yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10e303da..61fa0e5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,8 @@ jobs: run: smalltalkci -s ${{ matrix.smalltalk }} shell: bash timeout-minutes: 20 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} slack-workflow-status: if: always() name: Post Workflow Status To Slack From 3d52c8272115c14ed5a10fcd4f61eee4137ec9a5 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 11:42:31 -0800 Subject: [PATCH 13/18] Issue #37: try to avoid avoid conflicts with SeasideSt/Grease:gsdevkit-merge --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61fa0e5a..5dfc5aad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,17 @@ on: jobs: test: + runs-on: ${{ ubuntu-latest }} strategy: fail-fast: false matrix: - os: [ ubuntu-22.04, ubuntu-24.04, macos-latest] - smalltalk: [ GemStone64-3.7.2, GemStone64-3.7.1, GemStone64-3.6.8 ] - runs-on: ${{ matrix.os }} + smalltalk: [ Pharo64-13, Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-6.0 ] + experimental: [ false ] + include: + - smalltalk: Pharo64-14 + experimental: true + continue-on-error: ${{ matrix.experimental }} + name: ${{ matrix.smalltalk }} steps: - uses: actions/checkout@v4 - uses: dalehenrich/setup-smalltalkCI@solo From aaeb86eb519257321c953f8738899cc4224244c0 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 11:44:40 -0800 Subject: [PATCH 14/18] Issue #37: yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5dfc5aad..7cefdd39 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: jobs: test: - runs-on: ${{ ubuntu-latest }} + runs-on: ubuntu-latest strategy: fail-fast: false matrix: From f6476286c5ff1352330da61b8dc6a81d6e25673e Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 11:54:16 -0800 Subject: [PATCH 15/18] Issue #37: remove the pharo versions that are not supported, in the interest of getting a green result --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7cefdd39..50d5deaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - smalltalk: [ Pharo64-13, Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-6.0 ] + smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-6.0 ] experimental: [ false ] include: - smalltalk: Pharo64-14 From c2440acb9a9a2492bcece58435d4ff4daaa49d09 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 11:56:16 -0800 Subject: [PATCH 16/18] Issue #37: oops missed Pharo64-14, in the interest of getting a green result --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50d5deaa..58e0796d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,6 @@ jobs: matrix: smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-6.0 ] experimental: [ false ] - include: - - smalltalk: Pharo64-14 - experimental: true continue-on-error: ${{ matrix.experimental }} name: ${{ matrix.smalltalk }} steps: From 0f6d5f7f29af6b16459905f1d6f35a8a6a4d8521 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 12:44:10 -0800 Subject: [PATCH 17/18] Issue #37: switch form dalehenrich/setup-smalltalkCI@solo to hpi-swa/setup-smalltalkCI@v1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58e0796d..a8420de2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: name: ${{ matrix.smalltalk }} steps: - uses: actions/checkout@v4 - - uses: dalehenrich/setup-smalltalkCI@solo + - uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }} - name: Run tests From e65dbc1e7a4ec386bb1f8af22c4c9d607f92d719 Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 1 Dec 2025 12:49:47 -0800 Subject: [PATCH 18/18] Issue #37: add back the full set of Pharo versions --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a8420de2..8847cc95 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,8 +14,11 @@ jobs: strategy: fail-fast: false matrix: - smalltalk: [ Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-6.0 ] + smalltalk: [ Pharo64-13, Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.8, Squeak64-6.0 ] experimental: [ false ] + include: + - smalltalk: Pharo64-14 + experimental: true continue-on-error: ${{ matrix.experimental }} name: ${{ matrix.smalltalk }} steps: