From c5d0ca6847bcc1a83610d7adb3242a2869ca654d Mon Sep 17 00:00:00 2001 From: Norbert Hartl Date: Wed, 16 Mar 2022 15:17:30 +0100 Subject: [PATCH 1/5] - added pharo10 platform attribute section - removed GT loading - upgraded grease to 1.8 --- .../BaselineOfMagritte.class.st | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/source/BaselineOfMagritte/BaselineOfMagritte.class.st b/source/BaselineOfMagritte/BaselineOfMagritte.class.st index d96038ef..0573a9af 100644 --- a/source/BaselineOfMagritte/BaselineOfMagritte.class.st +++ b/source/BaselineOfMagritte/BaselineOfMagritte.class.st @@ -34,7 +34,7 @@ BaselineOfMagritte >> baseline310CommonExtDeps: spec [ "Common external dependencies for baseline 3.1.0" spec - baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.7.x/repository' ]; + baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.8.x/repository' ]; baseline: 'Seaside3' with: [ "note: we do not want to depend on Zinc, since this is not present in Squeak. Currently no adapter is loaded" spec @@ -59,10 +59,24 @@ BaselineOfMagritte >> baseline330ForPharo: spec [ group: 'Tools' with: #('Magritte-Pharo-Tools'); group: 'default' with: #('Magritte-Morph') ]. - spec for: #'pharo9.x' do: [ + spec for: #(#'pharo9.x' #'pharo10.x') do: [ spec package: 'Magritte-Pillar' with: [ spec requires: #('Magritte-Model') "assumes Pillar is loaded, which is the case in P9 and GT" ] ]. + + spec for: #(#'pharo10.x') do: [ + spec + baseline: 'PharoEnhancements' with: [ + spec repository: 'github://seandenigris/Pharo-Enhancements' ]. + spec + " create a temporary alias " + package: 'Magritte-Pharo7-Model' with: [ spec requires: #('Magritte-Model') ]; + package: 'Magritte-Pharo-Model' with: [ + spec + includes: #('Magritte-Pharo7-Model'); + requires: #('Magritte-Model') ]; + package: 'Magritte-Developer' with: [ spec requires: #('Magritte-Model') ]. + spec group: 'default' with: #('Magritte-Developer') ]. spec for: #(#'pharo7.x' #'pharo8.x' #'pharo9.x') do: [ spec @@ -70,7 +84,8 @@ BaselineOfMagritte >> baseline330ForPharo: spec [ spec repository: 'github://seandenigris/Pharo-Enhancements' ]. spec " create a temporary alias " - package: 'Magritte-Pharo-Model' with: 'Magritte-Pharo7-Model'; + package: 'Magritte-Pharo7-Model'; + package: 'Magritte-Pharo-Model' with: [ spec includes: #('Magritte-Pharo7-Model') ]; package: 'Magritte-Glamour' with: [ spec requires: #('Magritte-Model' 'Magritte-Morph') ]; package: 'Magritte-GT' with: [ spec requires: #('Magritte-Morph' 'Magritte-Glamour') ]; package: 'Magritte-Developer' with: [ spec requires: #('Magritte-Model') ]. From ad44a554893157cdffaac523729186638d0344bc Mon Sep 17 00:00:00 2001 From: Norbert Hartl Date: Wed, 16 Mar 2022 15:50:03 +0100 Subject: [PATCH 2/5] enable pharo10 for github actions --- .github/workflows/runTests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runTests.yaml b/.github/workflows/runTests.yaml index 86a1fd25..57bb6c65 100644 --- a/.github/workflows/runTests.yaml +++ b/.github/workflows/runTests.yaml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - smalltalk: [ Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo32-7.0 ] + smalltalk: [ Pharo64-10.0, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo32-7.0 ] name: ${{ matrix.smalltalk }} # Steps represent a sequence of tasks that will be executed as part of the job From cb397fcb73dcbb9712f8b97a807b47d3c0b6df3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Tue, 3 May 2022 21:29:58 +0200 Subject: [PATCH 3/5] Update CI yml to recognize Pharo 10 for smalltalkci --- .github/workflows/runTests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/runTests.yaml b/.github/workflows/runTests.yaml index 57bb6c65..79bd8ab6 100644 --- a/.github/workflows/runTests.yaml +++ b/.github/workflows/runTests.yaml @@ -24,7 +24,7 @@ jobs: strategy: matrix: - smalltalk: [ Pharo64-10.0, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo32-7.0 ] + smalltalk: [ Pharo64-stable, Pharo64-9.0, Pharo64-8.0, Pharo64-7.0, Pharo32-7.0 ] name: ${{ matrix.smalltalk }} # Steps represent a sequence of tasks that will be executed as part of the job From 91066e9897520380e6b181005938cf5792677f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Fri, 6 May 2022 21:24:06 +0200 Subject: [PATCH 4/5] Add Grease:v1.9.0 for Pharo 10 and Grease:v1.8.x for Pharo < 10 in Baseline. Refactored a code block for Squeak in Baseline. --- .../BaselineOfMagritte.class.st | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/source/BaselineOfMagritte/BaselineOfMagritte.class.st b/source/BaselineOfMagritte/BaselineOfMagritte.class.st index 0573a9af..92764252 100644 --- a/source/BaselineOfMagritte/BaselineOfMagritte.class.st +++ b/source/BaselineOfMagritte/BaselineOfMagritte.class.st @@ -34,7 +34,6 @@ BaselineOfMagritte >> baseline310CommonExtDeps: spec [ "Common external dependencies for baseline 3.1.0" spec - baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.8.x/repository' ]; baseline: 'Seaside3' with: [ "note: we do not want to depend on Zinc, since this is not present in Squeak. Currently no adapter is loaded" spec @@ -45,29 +44,16 @@ BaselineOfMagritte >> baseline310CommonExtDeps: spec [ { #category : #baselines } BaselineOfMagritte >> baseline330ForPharo: spec [ - spec for: #squeakCommon do: [ - spec - package: 'Magritte-Model' with: [ spec includes: #('Magritte-Pharo-Model') ]; - package: 'Magritte-Tests-Model' with: [ spec includes: #('Magritte-Tests-Pharo-Model') ]; - package: 'Magritte-Pharo-Model' with: [ spec requires: #('Magritte-Model') ]; - package: 'Magritte-Tests-Pharo-Model' with: [ spec requires: #('Magritte-Pharo-Model') ]; - package: 'Magritte-Seaside' with: [ spec includes: #('Magritte-Pharo-Seaside') ]; - package: 'Magritte-Pharo-Seaside' with: [ spec requires: #('Magritte-Seaside') ]; - package: 'Magritte-Morph' with: [ spec requires: #('Magritte-Model') ]; - package: 'Magritte-Pharo-Tools' with: [ spec requires: #('Magritte-Deprecated') ]. - spec - group: 'Tools' with: #('Magritte-Pharo-Tools'); - group: 'default' with: #('Magritte-Morph') ]. - + spec for: #(#'pharo9.x' #'pharo10.x') do: [ spec package: 'Magritte-Pillar' with: [ spec requires: #('Magritte-Model') "assumes Pillar is loaded, which is the case in P9 and GT" ] ]. spec for: #(#'pharo10.x') do: [ - spec - baseline: 'PharoEnhancements' with: [ - spec repository: 'github://seandenigris/Pharo-Enhancements' ]. + spec + baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.9.0/repository' ]; + baseline: 'PharoEnhancements' with: [ spec repository: 'github://seandenigris/Pharo-Enhancements' ]. spec " create a temporary alias " package: 'Magritte-Pharo7-Model' with: [ spec requires: #('Magritte-Model') ]; @@ -80,8 +66,8 @@ BaselineOfMagritte >> baseline330ForPharo: spec [ spec for: #(#'pharo7.x' #'pharo8.x' #'pharo9.x') do: [ spec - baseline: 'PharoEnhancements' with: [ - spec repository: 'github://seandenigris/Pharo-Enhancements' ]. + baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.8.x/repository' ]; + baseline: 'PharoEnhancements' with: [ spec repository: 'github://seandenigris/Pharo-Enhancements' ]. spec " create a temporary alias " package: 'Magritte-Pharo7-Model'; @@ -105,6 +91,25 @@ BaselineOfMagritte >> baseline330ForPharo: spec [ spec group: 'default' with: #(#'Magritte-GToolkit' 'Magritte-Merging-Bloc') ] ] +{ #category : #baselines } +BaselineOfMagritte >> baseline330ForSqueak: spec [ + + spec for: #squeakCommon do: [ + spec + package: 'Magritte-Model' with: [ spec includes: #('Magritte-Pharo-Model') ]; + package: 'Magritte-Tests-Model' with: [ spec includes: #('Magritte-Tests-Pharo-Model') ]; + package: 'Magritte-Pharo-Model' with: [ spec requires: #('Magritte-Model') ]; + package: 'Magritte-Tests-Pharo-Model' with: [ spec requires: #('Magritte-Pharo-Model') ]; + package: 'Magritte-Seaside' with: [ spec includes: #('Magritte-Pharo-Seaside') ]; + package: 'Magritte-Pharo-Seaside' with: [ spec requires: #('Magritte-Seaside') ]; + package: 'Magritte-Morph' with: [ spec requires: #('Magritte-Model') ]; + package: 'Magritte-Pharo-Tools' with: [ spec requires: #('Magritte-Deprecated') ]. + spec + group: 'Tools' with: #('Magritte-Pharo-Tools'); + group: 'default' with: #('Magritte-Morph') ]. + +] + { #category : #baselines } BaselineOfMagritte >> baseline: spec [ @@ -134,6 +139,7 @@ BaselineOfMagritte >> baseline: spec [ group: 'Seaside' with: #('Magritte-Seaside'); group: 'Deprecated' with: #('Magritte-Deprecated') ]. self baseline330ForPharo: spec. + self baseline330ForSqueak: spec. self baseline300ForGemStone: spec ] From 1c22b10e33cc2cbfe25d7098650979935964fd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Morales=20Durand?= Date: Sat, 7 May 2022 10:31:13 +0200 Subject: [PATCH 5/5] Use Grease:v1.9.0 also for Pharo < 10 since Grease tests pass. Renamed method to #baseline330ForSqueakCommon as Sean suggested. --- source/BaselineOfMagritte/BaselineOfMagritte.class.st | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/BaselineOfMagritte/BaselineOfMagritte.class.st b/source/BaselineOfMagritte/BaselineOfMagritte.class.st index 92764252..a118ca25 100644 --- a/source/BaselineOfMagritte/BaselineOfMagritte.class.st +++ b/source/BaselineOfMagritte/BaselineOfMagritte.class.st @@ -34,6 +34,7 @@ BaselineOfMagritte >> baseline310CommonExtDeps: spec [ "Common external dependencies for baseline 3.1.0" spec + baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.9.0/repository' ]; baseline: 'Seaside3' with: [ "note: we do not want to depend on Zinc, since this is not present in Squeak. Currently no adapter is loaded" spec @@ -52,7 +53,6 @@ BaselineOfMagritte >> baseline330ForPharo: spec [ spec for: #(#'pharo10.x') do: [ spec - baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.9.0/repository' ]; baseline: 'PharoEnhancements' with: [ spec repository: 'github://seandenigris/Pharo-Enhancements' ]. spec " create a temporary alias " @@ -66,7 +66,6 @@ BaselineOfMagritte >> baseline330ForPharo: spec [ spec for: #(#'pharo7.x' #'pharo8.x' #'pharo9.x') do: [ spec - baseline: 'Grease' with: [ spec repository: 'github://SeasideSt/Grease:v1.8.x/repository' ]; baseline: 'PharoEnhancements' with: [ spec repository: 'github://seandenigris/Pharo-Enhancements' ]. spec " create a temporary alias " @@ -92,7 +91,7 @@ BaselineOfMagritte >> baseline330ForPharo: spec [ ] { #category : #baselines } -BaselineOfMagritte >> baseline330ForSqueak: spec [ +BaselineOfMagritte >> baseline330ForSqueakCommon: spec [ spec for: #squeakCommon do: [ spec @@ -139,7 +138,7 @@ BaselineOfMagritte >> baseline: spec [ group: 'Seaside' with: #('Magritte-Seaside'); group: 'Deprecated' with: #('Magritte-Deprecated') ]. self baseline330ForPharo: spec. - self baseline330ForSqueak: spec. + self baseline330ForSqueakCommon: spec. self baseline300ForGemStone: spec ]