From 2bb3e61eea87d205990c02fbf6b864ccbdb5e081 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Wed, 10 Jul 2024 11:31:06 +0200 Subject: [PATCH 1/3] add pharo 13 to the baseline --- .../BaselineOfParasol.class/instance/baseline..st | 2 +- .../instance/customProjectAttributes.st | 5 +++-- .../BaselineOfParasol.package/monticello.meta/categories.st | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st index 428f5c2..44fda0b 100644 --- a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st +++ b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/baseline..st @@ -50,7 +50,7 @@ baseline: spec with: [ spec requires: #('Parasol-Core' 'Ston') ]; package: 'Parasol-Core' with: [ spec includes: #('Parasol-Pharo') ] ]. spec - for: #('pharo9.x' 'pharo10.x' 'pharo11.x' 'pharo12.x') + for: #('pharo9.x' 'pharo10.x' 'pharo11.x' 'pharo12.x' 'pharo13.x') do: [ spec package: 'Parasol-Pharo9' diff --git a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/customProjectAttributes.st b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/customProjectAttributes.st index 1c07394..90c85d1 100644 --- a/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/customProjectAttributes.st +++ b/repository/BaselineOfParasol.package/BaselineOfParasol.class/instance/customProjectAttributes.st @@ -1,5 +1,6 @@ accessing customProjectAttributes + ^ (Smalltalk at: #'WAAdmin' ifAbsent: [ nil ]) - ifNil: [ #(#'loadSeaside') ] - ifNotNil: [ #() ] \ No newline at end of file + ifNil: [ #(#'loadSeaside') ] + ifNotNil: [ #() ] \ No newline at end of file diff --git a/repository/BaselineOfParasol.package/monticello.meta/categories.st b/repository/BaselineOfParasol.package/monticello.meta/categories.st index 6ffebde..26eec8c 100644 --- a/repository/BaselineOfParasol.package/monticello.meta/categories.st +++ b/repository/BaselineOfParasol.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #BaselineOfParasol! +self packageOrganizer ensurePackage: #BaselineOfParasol withTags: #()! From 1e7ed311321edf449836d9366db7650293b71afc Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Wed, 10 Jul 2024 11:33:22 +0200 Subject: [PATCH 2/3] add pharo 13 to experimental builds and update version numbers for other platforms --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 187add6..26c7c1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,10 +8,10 @@ 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 ] + smalltalk: [ Pharo64-12, Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, GemStone64-3.7.1, GemStone64-3.6.8, GemStone64-3.5.7 ] experimental: [ false ] include: - - smalltalk: Pharo64-12 + - smalltalk: Pharo64-13 experimental: true - smalltalk: Squeak64-5.3 experimental: true From 4ac31886f1a6a2a5ee46166780052dfbb814361a Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Wed, 10 Jul 2024 11:38:36 +0200 Subject: [PATCH 3/3] address github action deprecation --- .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 26c7c1d..d636ed8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} name: ${{ matrix.smalltalk }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }}