From 5494c1301f59fb2628d76fb38b90289bc04b250d Mon Sep 17 00:00:00 2001 From: Max Leske Date: Mon, 24 May 2021 21:08:07 +0200 Subject: [PATCH] No longer load STON for Squeak >= 5.4 Split package and group methods for Squeak in two (similar to Pharo) --- .../instance/baseline..st | 3 ++- .....st => setUpSqueak53AndLowerPackages..st} | 4 ++-- .../setUpSqueak54AndGreaterPackages..st | 21 +++++++++++++++++++ .../methodProperties.json | 12 +++++------ .../monticello.meta/version | 4 ++-- 5 files changed, 33 insertions(+), 11 deletions(-) rename repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/{setUpSqueakPackages..st => setUpSqueak53AndLowerPackages..st} (87%) create mode 100644 repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueak54AndGreaterPackages..st diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/baseline..st b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/baseline..st index f0bd37eb..b90a79dd 100644 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/baseline..st +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/baseline..st @@ -15,7 +15,8 @@ baseline: spec group: 'tests' with: #('SmalltalkCI-Tests'); yourself ]. - self setUpSqueakPackages: spec. + self setUpSqueak53AndLowerPackages: spec. + self setUpSqueak54AndGreaterPackages: spec. self setUpPharo3And4Packages: spec. self setUpPharo5AndGreaterPackages: spec. self setUpGemStonePackages: spec \ No newline at end of file diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueakPackages..st b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueak53AndLowerPackages..st similarity index 87% rename from repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueakPackages..st rename to repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueak53AndLowerPackages..st index abeb9be1..918c4604 100644 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueakPackages..st +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueak53AndLowerPackages..st @@ -1,5 +1,5 @@ baseline -setUpSqueakPackages: spec +setUpSqueak53AndLowerPackages: spec spec for: #squeakCommon @@ -10,7 +10,7 @@ setUpSqueakPackages: spec yourself ]. spec - for: #squeak + for: #('squeak4.x' 'squeak5.0.x' 'squeak5.1.x' 'squeak5.2.x' 'squeak5.3.x') do: [ spec package: 'STON-Core'; package: 'STON-Tests'; diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueak54AndGreaterPackages..st b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueak54AndGreaterPackages..st new file mode 100644 index 00000000..ed6e8c42 --- /dev/null +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpSqueak54AndGreaterPackages..st @@ -0,0 +1,21 @@ +baseline +setUpSqueak54AndGreaterPackages: spec + + spec + for: #squeakCommon + do: [ spec + package: 'SmalltalkCI-Coverage-Core' with: [ spec requires: #('SmalltalkCI-Core') ]; + package: 'SmalltalkCI-Coverage-Tests' + with: [ spec requires: #('SmalltalkCI-Tests' 'SmalltalkCI-Coverage-Core') ]; + yourself + ]. + spec + for: #('squeak5.4.x') + do: [ spec + package: 'SmalltalkCI-Core' + with: [ spec includes: #('SmalltalkCI-Squeak-Core') ]; + package: 'SmalltalkCI-Squeak-Core' + with: [ spec requires: #('SmalltalkCI-Core' 'SmalltalkCI-Coverage-Core') ]; + package: 'SmalltalkCI-Squeak-Tests' with: [ spec requires: #('SmalltalkCI-Squeak-Core') ]. + spec group: 'tests' with: #('SmalltalkCI-Squeak-Tests' 'SmalltalkCI-Coverage-Tests' 'STON-Tests') + ] \ No newline at end of file diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json index 9564401a..c78d1b44 100644 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json @@ -1,10 +1,10 @@ { + "class" : { + }, "instance" : { - "setUpSqueakPackages:" : "GOC 10/3/2019 09:36", - "setUpPharo3And4Packages:" : "GOC 10/3/2019 11:30", + "baseline:" : "mml 5/24/2021 20:44", "setUpGemStonePackages:" : "GOC 10/3/2019 09:36", + "setUpPharo3And4Packages:" : "GOC 10/3/2019 11:30", "setUpPharo5AndGreaterPackages:" : "GOC 10/3/2019 11:30", - "baseline:" : "GOC 10/3/2019 11:30" - }, - "class" : { } -} \ No newline at end of file + "setUpSqueak53AndLowerPackages:" : "mml 5/24/2021 21:03", + "setUpSqueak54AndGreaterPackages:" : "mml 5/24/2021 21:03" } } diff --git a/repository/BaselineOfSmalltalkCI.package/monticello.meta/version b/repository/BaselineOfSmalltalkCI.package/monticello.meta/version index 1047f488..c17d5686 100644 --- a/repository/BaselineOfSmalltalkCI.package/monticello.meta/version +++ b/repository/BaselineOfSmalltalkCI.package/monticello.meta/version @@ -1,2 +1,2 @@ -(name 'BaselineOfSmalltalkCI-GOC.1570035213' message 'Fixed baseline groups for old Pharo versions' id 'eac68a31-6450-0d00-8dc2-d01f04c51116' date '3 October 2019' time '11:32:35.36883 am' author 'GOC' ancestors ((name 'BaselineOfSmalltalkCI-GOC.1570035212' message 'Adapt the baseline to exclude coverage support in Pharo 3/4' id '13b839a0-6250-0d00-8dba-57f104c51116' date '3 October 2019' time '9:40:22.393 am' author 'GOC' ancestors ((name 'BaselineOfSmalltalkCI-CompatibleUserName.1570035211' message 'Fix #441 Use #refersToLiteral: method in Pharo to discover methods including the pragma -' id 'e397852c-1033-5d7e-b774-5439f09e1d87' date '2 October 2019' time '1:53:31 pm' author 'CompatibleUserName' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'BaselineOfSmalltalkCI-mml.1570035216' message 'Fixed Squeak platform attribute used in package and group setup' id '6a2641d9-56dc-4ec4-b4ab-e0cffb38915f' date '24 May 2021' time '9:04:08.155402 pm' author 'mml' ancestors ((name 'BaselineOfSmalltalkCI-smalltalkCI.1570035215' message 'Need to reference 5.4 explicitly to avoid override by #squeak platform attribute' id '628c1d27-0e0c-4296-832a-7da25c3f85b4' date '24 May 2021' time '8:59:16.53368 pm' author 'smalltalkCI' ancestors ((name 'BaselineOfSmalltalkCI-mml.1570035214' message 'User separate methods for loading packages for Squeak >= / < 5.4. Don''t load STON for 5.4+' id 'a82f0879-d225-4175-98fa-80d1b7d38ad1' date '24 May 2021' time '8:48:09.881494 pm' author 'mml' ancestors ((name 'BaselineOfSmalltalkCI-GOC.1570035213' message 'Fixed baseline groups for old Pharo versions' id 'eac68a31-6450-0d00-8dc2-d01f04c51116' date '3 October 2019' time '11:32:35.36883 am' author 'GOC' ancestors ((name 'BaselineOfSmalltalkCI-GOC.1570035212' message 'Adapt the baseline to exclude coverage support in Pharo 3/4' id '13b839a0-6250-0d00-8dba-57f104c51116' date '3 October 2019' time '9:40:22.393 am' author 'GOC' ancestors ((name 'BaselineOfSmalltalkCI-CompatibleUserName.1570035211' message 'Fix #441 Use #refersToLiteral: method in Pharo to discover methods including the pragma +' id 'e397852c-1033-5d7e-b774-5439f09e1d87' date '2 October 2019' time '1:53:31 pm' author 'CompatibleUserName' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file