From a032f3593578ba75b2b003aeb471525f125ae50f Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Mon, 21 Dec 2015 15:07:12 -0800 Subject: [PATCH 1/3] update for GemStone 3.4 ... --- .../BaselineOfGrease.class/instance/baseline..st | 2 +- .../BaselineOfGrease.class/methodProperties.json | 2 +- repository/BaselineOfGrease.package/monticello.meta/version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st index f3ce6c0e..b7d291b1 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/instance/baseline..st @@ -178,7 +178,7 @@ baseline: spec requires: #('Grease-GemStone-Core'); postLoadDoIt: #'initializeLatin1ToUtf8Encodings' ] ]. spec - for: #(#'gs3.2.x' #'gs3.3.x') + for: #(#'gs3.2.x' #'gs3.3.x' #'gs3.4.x') do: [ spec package: 'Grease-Tests-GemStone-Core' diff --git a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json index 5a4bd2a4..d54c9996 100644 --- a/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json +++ b/repository/BaselineOfGrease.package/BaselineOfGrease.class/methodProperties.json @@ -2,6 +2,6 @@ "class" : { }, "instance" : { - "baseline:" : "dkh 05/26/2015 11:45", + "baseline:" : "dkh 12/21/2015 14:45", "initializeLatin1ToUtf8Encodings" : "JohanBrichau 10/19/2014 10:00", "slimeForSqueakPharo1xPharo2x:" : "JohanBrichau 02/16/2014 03:49" } } diff --git a/repository/BaselineOfGrease.package/monticello.meta/version b/repository/BaselineOfGrease.package/monticello.meta/version index fcda000f..31ff2438 100644 --- a/repository/BaselineOfGrease.package/monticello.meta/version +++ b/repository/BaselineOfGrease.package/monticello.meta/version @@ -1 +1 @@ -(name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '05/26/2015' time '11:46:07' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '03/22/2015' time '12:01:37' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '11/08/2014' time '09:28:01' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '10/19/2014' time '10:05:25' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '10/19/2014' time '10:04:55' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '06/04/2014' time '15:13:26' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '06/04/2014' time '15:12:31' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '06/04/2014' time '14:57:48' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '02/16/2014' time '03:50:22' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '02/16/2014' time '01:49:46' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file +(name 'BaselineOfGrease-dkh.10' message 'update for GemStone 3.4 ...' id 'ad7f9331-d83f-4976-bf57-1d1e81111fc6' date '12/21/2015' time '15:07:11' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.9' message 'Update baseline for GemStone 3.3' id 'af9364dd-14bc-4e5e-9fc7-0abe08732ab2' date '05/26/2015' time '11:46:07' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.8' message 'separate package for Squeak' id '91c019c7-2b8b-40c3-97d9-2047a69512a7' date '03/22/2015' time '12:01:37' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.7' message 'included Pharo 4 and did some baseline formatting' id '3722041d-d4b5-4496-a25a-0e891fe9a945' date '11/08/2014' time '09:28:01' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id '4d976044-1aa9-44b6-bab0-b66ac758b3cd' date '10/19/2014' time '10:05:25' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.6' message 'added initializeLatin1ToUtf8Encodings' id 'b4ac5766-d472-4557-beff-59e5b733bce0' date '10/19/2014' time '10:04:55' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-dkh.5' message 'typoe' id '93eb3230-7956-4a6e-85dc-243f3dd895a1' date '06/04/2014' time '15:13:26' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.4' message 'woops specified the package branch incorrectly ... I think I got it right this time...' id '3003ee31-9d17-4dd1-9b9a-f8a80e4f0ba1' date '06/04/2014' time '15:12:31' author 'dkh' ancestors ((name 'BaselineOfGrease-dkh.3' message 'add Grease-Tests-GemStone-Core.v32 to baseline' id '26f128ca-b62e-4295-9a58-a9758b670c37' date '06/04/2014' time '14:57:48' author 'dkh' ancestors ((name 'BaselineOfGrease-JohanBrichau.2' message 'forgotten methods' id '38758da9-c922-4530-a19e-f8783900e787' date '02/16/2014' time '03:50:22' author 'JohanBrichau' ancestors ((name 'BaselineOfGrease-JohanBrichau.1' message 'first baseline' id 'b89398df-14c6-4b6a-a2ba-91ad806bb07f' date '02/16/2014' time '01:49:46' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From f60f89073fb6fc5e0f81eef76d2c6b3b2ed3defc Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Fri, 26 Aug 2016 14:56:18 +0200 Subject: [PATCH 2/3] allow pharo6.0 failures ... until pharo 6.0 approaches release ... add a .gitignore file --- .gitignore | 6 ++++++ .travis.yml | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..6c5ee8df --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +*.un~ +Session.vim +.netrwhist +*~ diff --git a/.travis.yml b/.travis.yml index 367126e0..1b1e543a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,5 @@ smalltalk: cache: directories: - $SMALLTALK_CI_CACHE +allow_failures: + - smalltalk: Pharo-6.0 From a8b603fb03b1561fbf3ecb948958dd2b2bfb09bc Mon Sep 17 00:00:00 2001 From: Dale Henrichs Date: Fri, 26 Aug 2016 15:05:24 +0200 Subject: [PATCH 3/3] allow_failures needs to be in a matrix: --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1b1e543a..b335436a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,5 +15,6 @@ smalltalk: cache: directories: - $SMALLTALK_CI_CACHE -allow_failures: - - smalltalk: Pharo-6.0 +matrix: + allow_failures: + - smalltalk: Pharo-6.0