From 8d9a8806f6000a8c16e5e5bc655b39f382978754 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 14 Apr 2023 17:05:15 +0200 Subject: [PATCH 1/2] Each time a version of Pharo is released we need to update the baseline if we want to be able to be able to load smalltalk CI in the new Pharo version. Here is a little improvement to not have to do that again. --- .../BaselineOfSmalltalkCI.package/.filetree | 5 +++-- .../instance/pharoVersionsFrom..st | 4 ++++ .../setUpPharo5AndGreaterPackages..st | 2 +- .../methodProperties.json | 10 ---------- .../properties.json | 19 ++++++++----------- .../monticello.meta/version | 2 -- .../properties.json | 3 +-- 7 files changed, 17 insertions(+), 28 deletions(-) create mode 100644 repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/pharoVersionsFrom..st delete mode 100644 repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json delete mode 100644 repository/BaselineOfSmalltalkCI.package/monticello.meta/version diff --git a/repository/BaselineOfSmalltalkCI.package/.filetree b/repository/BaselineOfSmalltalkCI.package/.filetree index 8998102c..57a67973 100644 --- a/repository/BaselineOfSmalltalkCI.package/.filetree +++ b/repository/BaselineOfSmalltalkCI.package/.filetree @@ -1,4 +1,5 @@ { - "noMethodMetaData" : true, "separateMethodMetaAndSource" : false, - "useCypressPropertiesFile" : true } + "noMethodMetaData" : true, + "useCypressPropertiesFile" : true +} \ No newline at end of file diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/pharoVersionsFrom..st b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/pharoVersionsFrom..st new file mode 100644 index 00000000..5ee4c228 --- /dev/null +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/pharoVersionsFrom..st @@ -0,0 +1,4 @@ +baselines +pharoVersionsFrom: aVersion + + ^ (aVersion to: SystemVersion current major) collect: [ :v | ('pharo' , v asString , '.x') asSymbol ] \ No newline at end of file diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st index f5d5945e..539398a8 100644 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/instance/setUpPharo5AndGreaterPackages..st @@ -2,7 +2,7 @@ baseline setUpPharo5AndGreaterPackages: spec spec - for: #(#'pharo5.x' #'pharo6.x' #'pharo7.x' #'pharo8.x' #'pharo9.x' #'pharo10.x' #'pharo11.x') + for: (self pharoVersionsFrom: 5) do: [ spec package: 'SmalltalkCI-Core' with: [ spec includes: #('SmalltalkCI-Pharo-Core') ]; package: 'SmalltalkCI-Pharo-Core' with: [ spec requires: 'SmalltalkCI-Core' ]; diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json deleted file mode 100644 index 9564401a..00000000 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "instance" : { - "setUpSqueakPackages:" : "GOC 10/3/2019 09:36", - "setUpPharo3And4Packages:" : "GOC 10/3/2019 11:30", - "setUpGemStonePackages:" : "GOC 10/3/2019 09:36", - "setUpPharo5AndGreaterPackages:" : "GOC 10/3/2019 11:30", - "baseline:" : "GOC 10/3/2019 11:30" - }, - "class" : { } -} \ No newline at end of file diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json index fae43b65..d8bb2409 100644 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json @@ -1,14 +1,11 @@ { - "category" : "BaselineOfSmalltalkCI", - "classinstvars" : [ - ], - "classvars" : [ - ], "commentStamp" : "", - "instvars" : [ - ], - "name" : "BaselineOfSmalltalkCI", - "pools" : [ - ], "super" : "BaselineOf", - "type" : "normal" } + "category" : "BaselineOfSmalltalkCI", + "classinstvars" : [ ], + "pools" : [ ], + "classvars" : [ ], + "instvars" : [ ], + "name" : "BaselineOfSmalltalkCI", + "type" : "normal" +} \ No newline at end of file diff --git a/repository/BaselineOfSmalltalkCI.package/monticello.meta/version b/repository/BaselineOfSmalltalkCI.package/monticello.meta/version deleted file mode 100644 index 1047f488..00000000 --- a/repository/BaselineOfSmalltalkCI.package/monticello.meta/version +++ /dev/null @@ -1,2 +0,0 @@ -(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 diff --git a/repository/BaselineOfSmalltalkCI.package/properties.json b/repository/BaselineOfSmalltalkCI.package/properties.json index f037444a..6f31cf5a 100644 --- a/repository/BaselineOfSmalltalkCI.package/properties.json +++ b/repository/BaselineOfSmalltalkCI.package/properties.json @@ -1,2 +1 @@ -{ - } +{ } \ No newline at end of file From e285ed1fb23299af2d14864b1dddb00c788f0b35 Mon Sep 17 00:00:00 2001 From: CyrilFerlicot Date: Fri, 14 Apr 2023 17:08:46 +0200 Subject: [PATCH 2/2] Manually fix metadatas... --- .../BaselineOfSmalltalkCI.package/.filetree | 5 ++--- .../methodProperties.json | 11 +++++++++++ .../properties.json | 19 +++++++++++-------- .../monticello.meta/version | 2 ++ .../properties.json | 3 ++- 5 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json create mode 100644 repository/BaselineOfSmalltalkCI.package/monticello.meta/version diff --git a/repository/BaselineOfSmalltalkCI.package/.filetree b/repository/BaselineOfSmalltalkCI.package/.filetree index 57a67973..8998102c 100644 --- a/repository/BaselineOfSmalltalkCI.package/.filetree +++ b/repository/BaselineOfSmalltalkCI.package/.filetree @@ -1,5 +1,4 @@ { - "separateMethodMetaAndSource" : false, "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file + "separateMethodMetaAndSource" : false, + "useCypressPropertiesFile" : true } diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json new file mode 100644 index 00000000..11a11d7f --- /dev/null +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/methodProperties.json @@ -0,0 +1,11 @@ +{ + "instance" : { + "setUpSqueakPackages:" : "GOC 10/3/2019 09:36", + "setUpPharo3And4Packages:" : "GOC 10/3/2019 11:30", + "setUpGemStonePackages:" : "GOC 10/3/2019 09:36", + "setUpPharo5AndGreaterPackages:" : "GOC 10/3/2019 11:30", + "baseline:" : "CyrilFerlicot 14/04/2023 17:07", + "pharoVersionFrom:" : "CyrilFerlicot 14/04/2023 17:07" + }, + "class" : { } +} \ No newline at end of file diff --git a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json index d8bb2409..fae43b65 100644 --- a/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json +++ b/repository/BaselineOfSmalltalkCI.package/BaselineOfSmalltalkCI.class/properties.json @@ -1,11 +1,14 @@ { - "commentStamp" : "", - "super" : "BaselineOf", "category" : "BaselineOfSmalltalkCI", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], "name" : "BaselineOfSmalltalkCI", - "type" : "normal" -} \ No newline at end of file + "pools" : [ + ], + "super" : "BaselineOf", + "type" : "normal" } diff --git a/repository/BaselineOfSmalltalkCI.package/monticello.meta/version b/repository/BaselineOfSmalltalkCI.package/monticello.meta/version new file mode 100644 index 00000000..1047f488 --- /dev/null +++ b/repository/BaselineOfSmalltalkCI.package/monticello.meta/version @@ -0,0 +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 diff --git a/repository/BaselineOfSmalltalkCI.package/properties.json b/repository/BaselineOfSmalltalkCI.package/properties.json index 6f31cf5a..f037444a 100644 --- a/repository/BaselineOfSmalltalkCI.package/properties.json +++ b/repository/BaselineOfSmalltalkCI.package/properties.json @@ -1 +1,2 @@ -{ } \ No newline at end of file +{ + }