From 7f32e9beafe426daf1dc9fd4920e4e1b20e9f2b2 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Fri, 19 Apr 2024 10:56:55 +0200 Subject: [PATCH 1/3] revert smalltalk-CI use of branch since https://github.com/hpi-swa/smalltalkCI/pull/638 was merged --- .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 b380e893f..95b7592e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: - uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ matrix.smalltalk }} - smalltalkCI-branch: 'master' - smalltalkCI-source: 'jbrichau/smalltalkCI' + # smalltalkCI-branch: 'master' + # smalltalkCI-source: 'jbrichau/smalltalkCI' # - name: Setup tmate session # uses: mxschmitt/action-tmate@v3 - name: Install Chrome From 0b9ec423facac604680a55b41c0b6f285cfe97e9 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Fri, 19 Apr 2024 11:14:42 +0200 Subject: [PATCH 2/3] Add the group 'All' to the baseline and reorganize the other groups a bit --- .../instance/baselinecommon..st | 11 ++++++----- .../monticello.meta/categories.st | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st index 3ac746b99..99409595f 100644 --- a/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st +++ b/repository/BaselineOfSeaside3.package/BaselineOfSeaside3.class/instance/baselinecommon..st @@ -97,15 +97,16 @@ baselinecommon: spec spec requires: #('Seaside-Tests-Core' ) ]; package: 'Seaside-Tests-Parasol' with: [ spec requires: #('Parasol' 'Seaside-Tests-Functional' 'Seaside-Tools-Core') ]. - spec + spec group: 'default' with: #('Core' 'JSON' 'Email' 'Javascript' 'JQuery' 'JQueryUI' 'Seaside-Examples' 'Seaside-Welcome'); - group: 'OneClick' with: #('Tests' 'Development' 'Zinc'); - group: 'CI' with: #('Tests' 'Development Tests' 'Seaside-HotwireTurbo-Core'); + group: 'Base' with: #('Core'); + group: 'CI' with: #('Tests' 'Development Tests' 'Hotwired'); + group: 'All' with: #('Tests' 'Development Tests'); + group: 'Core' with: #('Seaside-Core' 'Seaside-Continuation' 'Seaside-Canvas' 'Seaside-Session' 'Seaside-Component' 'Seaside-RenderLoop' 'Seaside-Tools-Core' 'Seaside-Flow' 'Seaside-Environment' 'Seaside-Widgets' ); group: 'Tests' with: #('Core' 'Seaside-Tests-Core' 'Seaside-Tests-Canvas' 'Seaside-Tests-Session' 'Seaside-Tests-Component' 'Seaside-Tests-RenderLoop' 'Seaside-Tests-Environment' 'Seaside-Tests-Flow' 'Seaside-Tests-UTF8' 'Seaside-Tests-InternetExplorer' 'Seaside-Tests-Email' 'Seaside-Tests-Examples' 'RSS Tests' 'Welcome Tests' 'REST Tests' 'Swagger Tests' 'Seaside-Tests-Parasol'); group: 'Hotwired' with: #('Seaside-HotwireTurbo-Core'); group: 'Development' with: #('Core' 'Seaside-Development'); group: 'Development Tests' with: #('Development' 'Core' 'Seaside-Tests-Development'); group: 'Email' with: #('Seaside-Email'); - group: 'Examples' with: #('Core' 'Seaside-Examples' 'Seaside-REST-Examples' 'Seaside-HotwireTurbo-Examples'); - group: 'Base' with: #('Core') ]. + group: 'Examples' with: #('Core' 'Seaside-Examples' 'Seaside-REST-Examples' 'Seaside-HotwireTurbo-Examples') ]. diff --git a/repository/BaselineOfSeaside3.package/monticello.meta/categories.st b/repository/BaselineOfSeaside3.package/monticello.meta/categories.st index 33792de89..0c4ffd322 100644 --- a/repository/BaselineOfSeaside3.package/monticello.meta/categories.st +++ b/repository/BaselineOfSeaside3.package/monticello.meta/categories.st @@ -1 +1 @@ -SystemOrganization addCategory: #BaselineOfSeaside3! +self packageOrganizer ensurePackage: #BaselineOfSeaside3 withTags: #()! From fff50a2e6bbc0d10678fc520be4c3388a740ba56 Mon Sep 17 00:00:00 2001 From: Johan Brichau Date: Fri, 19 Apr 2024 11:23:38 +0200 Subject: [PATCH 3/3] CI: Pharo 12 is no longer experimental --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95b7592e9..5f5c2c745 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,11 +8,9 @@ jobs: strategy: fail-fast: false matrix: - smalltalk: [ Pharo64-11, Pharo64-10, Pharo64-9.0, Pharo64-8.0, GemStone64-3.7.1, GemStone64-3.6.8, 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 - experimental: true - smalltalk: Squeak64-6.0 experimental: true - smalltalk: Squeak64-5.3