Skip to content

Commit

Permalink
Merge a8d75c8 into 378604b
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeonMatthes
LeonMatthes committed Sep 3, 2020
2 parents 378604b + a8d75c8 commit a7bab32
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 4 deletions.
3 changes: 2 additions & 1 deletion pharo/run.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,8 @@ pharo::load_project() {
load ] on: Warning do: [:w | w resume ].
smalltalkCI := (Smalltalk at: #SmalltalkCI).
smalltalkCI load: '$(resolve_path "${config_ston}")'.
smalltalkCI isHeadless ifTrue: [ smalltalkCI saveAndQuitImage ]
(smalltalkCI isHeadless or: [smalltalkCI promptToProceed])
ifTrue: [ smalltalkCI saveAndQuitImage ]
"
}

Expand Down
12 changes: 12 additions & 0 deletions repository/SmalltalkCI-Core.package/SmalltalkCI.class/class/promptToProceed.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
helpers
promptToProceed

"First, close any remaining progress bars, that are caused by reading the setup script"
SystemProgressMorph reset.

"The = true check here is necessary, as Squeak provides a 'cancel' button for some reason that returns nil."
^ (UIManager default
confirm: 'smalltalkCI has finished loading the project. The image is now ready for testing.
If you choose to inspect the image, you must save and quit the image to proceed.'
trueChoice: 'Proceed'
falseChoice: 'Inspect image') = true
1 change: 1 addition & 0 deletions repository/SmalltalkCI-Core.package/SmalltalkCI.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"printToStdout:" : "fn 9/27/2016 20:37",
"printToStdout:ansiColor:" : "fn 7/9/2017 00:47",
"printWarningToStdout:" : "fn 7/9/2017 00:47",
"promptToProceed" : "smalltalkCI 9/3/2020 12:07",
"quitImage" : "fn 10/11/2016 18:42",
"readOnlyFileNamed:do:" : "fn 11/20/2017 13:34",
"reportBuildError:" : "fn 11/20/2017 12:54",
Expand Down
2 changes: 1 addition & 1 deletion repository/SmalltalkCI-Core.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'SmalltalkCI-Core-smalltalkCI.251' message 'Add missing period in failAndQuit:' id 'ddfd0c64-51d6-48cb-a977-776e3b081e93' date '27 August 2020' time '3:26:18.498778 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.250' message 'Use correct platformClass for self calls in failAndQuit:' id 'b316831d-b0cb-4690-a465-2ae18d4747e0' date '26 August 2020' time '2:35:45.846989 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.249' message 'Add reference to image folder in saveAndQuit:' id '7d3e7080-d695-4a63-932d-38cf21e4a9ec' date '26 August 2020' time '2:32:45.92929 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.248' message 'Add failAndQuit: helper' id '922f314e-28b7-4738-90a4-e6844dc35ea0' date '26 August 2020' time '2:16:40.79477 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.247' message 'Fix unit in fold:on:block:' id '2d7dd736-99ac-4f39-936f-20828deba5c6' date '25 August 2020' time '1:06:34.562412 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-fn.246' message 'Do nothing by default in SCITestRunner>>serializeError:of: (#440).' id '5d923b61-521c-4d39-aab6-65bd3631e33f' date '26 September 2019' time '3:27:58.152573 pm' author 'fn' ancestors ((name 'SmalltalkCI-Core-EstebanLorenzano.245' message 'extend ignoreImage api to react to MetacelloIgnorePackageLoaded.This will force the load of a package already in image even if is in the ancestor list.' id 'a71d4650-a333-0d00-9a56-d9c206468e0a' date '2 October 2018' time '6:40:16.696915 pm' author 'EstebanLorenzano' ancestors ((name 'SmalltalkCI-Core-EstebanLorenzano.244' message 'expose #ignoreImage metacello api' id 'aa61a3ae-a133-0d00-be56-b23706db7c03' date '2 October 2018' time '4:43:29.93288 pm' author 'EstebanLorenzano' ancestors ((name 'SmalltalkCI-Core-fn.243' message 'Use classVariableNames instead of instanceVariableNames on class side (fixes #395).' id '60d9f141-3bd4-4585-b65e-14af44c01c81' date '2 October 2018' time '9:18:40.024 am' author 'fn' ancestors ((name 'SmalltalkCI-Core-fn.242' message 'Merge commit (240+241); apply #onConflict/#onUpgrade only when values are not nil.' id 'f287589a-5208-4534-b637-9cca010ca578' date '2 October 2018' time '8:51:04.357 am' author 'fn' ancestors ((name 'SmalltalkCI-Core-JohanBrichau.241' message 'Change option disableSerializeError to serializeError' id '7256b7b0-0a32-0d00-8794-11e9012935e3' date '12 September 2018' time '11:09:53.105902 am' author 'JohanBrichau' ancestors ((name 'SmalltalkCI-Core-JohanBrichau.240' message 'Change option disableSerializeError to serializeError' id 'd39938a7-0a32-0d00-8792-5dcd012935e3' date '12 September 2018' time '11:07:13.80521 am' author 'JohanBrichau' ancestors ((name 'SmalltalkCI-Core-fn.239' message 'Update Metacello repository URL.' id '10ec3dcf-d1fe-4fc3-9193-8affb4be053b' date '7 December 2017' time '11:34:47.321 am' author 'fn' ancestors () stepChildren ())) stepChildren ())) stepChildren ())(name 'SmalltalkCI-Core-EstebanLorenzano.240' message 'add #onConflict:/#onUpgrade: metacello logic' id 'be7e2fe1-4f33-0d00-9fd9-e2a50f2ac847' date '28 September 2018' time '3:07:50.658062 pm' author 'EstebanLorenzano' ancestors ((id '10ec3dcf-d1fe-4fc3-9193-8affb4be053b')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'SmalltalkCI-Core-smalltalkCI.254' message 'Add promptToProceed to SmalltalkCI' id 'c9c0b396-e8c2-4d04-a320-8377e0c16bec' date '3 September 2020' time '12:07:21.192529 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.253' message 'Close Progressbars before prompting to proceed' id '4ceddd02-20fb-4888-bb8b-fd9e5bff8671' date '3 September 2020' time '11:34:57.661483 am' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.252' message 'Add promptToProceed helper function' id 'dc0d9a8e-b8d4-4ccc-bd41-7519db135042' date '3 September 2020' time '11:17:47.176847 am' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.251' message 'Add missing period in failAndQuit:' id 'ddfd0c64-51d6-48cb-a977-776e3b081e93' date '27 August 2020' time '3:26:18.498778 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.250' message 'Use correct platformClass for self calls in failAndQuit:' id 'b316831d-b0cb-4690-a465-2ae18d4747e0' date '26 August 2020' time '2:35:45.846989 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.249' message 'Add reference to image folder in saveAndQuit:' id '7d3e7080-d695-4a63-932d-38cf21e4a9ec' date '26 August 2020' time '2:32:45.92929 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.248' message 'Add failAndQuit: helper' id '922f314e-28b7-4738-90a4-e6844dc35ea0' date '26 August 2020' time '2:16:40.79477 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-smalltalkCI.247' message 'Fix unit in fold:on:block:' id '2d7dd736-99ac-4f39-936f-20828deba5c6' date '25 August 2020' time '1:06:34.562412 pm' author 'smalltalkCI' ancestors ((name 'SmalltalkCI-Core-fn.246' message 'Do nothing by default in SCITestRunner>>serializeError:of: (#440).' id '5d923b61-521c-4d39-aab6-65bd3631e33f' date '26 September 2019' time '3:27:58.152573 pm' author 'fn' ancestors ((name 'SmalltalkCI-Core-EstebanLorenzano.245' message 'extend ignoreImage api to react to MetacelloIgnorePackageLoaded.This will force the load of a package already in image even if is in the ancestor list.' id 'a71d4650-a333-0d00-9a56-d9c206468e0a' date '2 October 2018' time '6:40:16.696915 pm' author 'EstebanLorenzano' ancestors ((name 'SmalltalkCI-Core-EstebanLorenzano.244' message 'expose #ignoreImage metacello api' id 'aa61a3ae-a133-0d00-be56-b23706db7c03' date '2 October 2018' time '4:43:29.93288 pm' author 'EstebanLorenzano' ancestors ((name 'SmalltalkCI-Core-fn.243' message 'Use classVariableNames instead of instanceVariableNames on class side (fixes #395).' id '60d9f141-3bd4-4585-b65e-14af44c01c81' date '2 October 2018' time '9:18:40.024 am' author 'fn' ancestors ((name 'SmalltalkCI-Core-fn.242' message 'Merge commit (240+241); apply #onConflict/#onUpgrade only when values are not nil.' id 'f287589a-5208-4534-b637-9cca010ca578' date '2 October 2018' time '8:51:04.357 am' author 'fn' ancestors ((name 'SmalltalkCI-Core-JohanBrichau.241' message 'Change option disableSerializeError to serializeError' id '7256b7b0-0a32-0d00-8794-11e9012935e3' date '12 September 2018' time '11:09:53.105902 am' author 'JohanBrichau' ancestors ((name 'SmalltalkCI-Core-JohanBrichau.240' message 'Change option disableSerializeError to serializeError' id 'd39938a7-0a32-0d00-8792-5dcd012935e3' date '12 September 2018' time '11:07:13.80521 am' author 'JohanBrichau' ancestors ((name 'SmalltalkCI-Core-fn.239' message 'Update Metacello repository URL.' id '10ec3dcf-d1fe-4fc3-9193-8affb4be053b' date '7 December 2017' time '11:34:47.321 am' author 'fn' ancestors () stepChildren ())) stepChildren ())) stepChildren ())(name 'SmalltalkCI-Core-EstebanLorenzano.240' message 'add #onConflict:/#onUpgrade: metacello logic' id 'be7e2fe1-4f33-0d00-9fd9-e2a50f2ac847' date '28 September 2018' time '3:07:50.658062 pm' author 'EstebanLorenzano' ancestors ((id '10ec3dcf-d1fe-4fc3-9193-8affb4be053b')) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down
6 changes: 6 additions & 0 deletions repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/instance/testPromptToProceed.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
testing
testPromptToProceed

self should: [SmalltalkCI promptToProceed] raise: ProvideAnswerNotification.
self assert: ([SmalltalkCI promptToProceed] valueSupplyingAnswer: true).
self deny: ([SmalltalkCI promptToProceed] valueSupplyingAnswer: false).
17 changes: 17 additions & 0 deletions ...ltalkCI-Tests.package/SmalltalkCITest.class/instance/testPromptToProceedClosesProgress.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
testing
testPromptToProceedClosesProgress

|progressMorph|
"Make sure we have a progress bar open"
progressMorph := SystemProgressMorph uniqueInstance
openInWorld;
yourself.
"Workaround for a bug in some Squeak versions. UniqueInstance isn't set when using lazy initialization"
SystemProgressMorph classPool at: #UniqueInstance put: progressMorph.

self assert: (self currentWorld findA: SystemProgressMorph) notNil.
[SmalltalkCI promptToProceed]
on: ProvideAnswerNotification
do: [:notification |
self assert: (self currentWorld findA: SystemProgressMorph) isNil.
notification resume: true]
2 changes: 2 additions & 0 deletions repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"testGitLabCIDetection" : "PeterUhnak 10/19/2017 13:04",
"testNew" : "fn 4/15/2016 14:44",
"testNewTravisID" : "fn 10/16/2016 12:16",
"testPromptToProceed" : "smalltalkCI 9/3/2020 12:09",
"testPromptToProceedClosesProgress" : "smalltalkCI 9/3/2020 12:44",
"testResolveAllWith" : "fn 6/22/2016 00:01",
"testResolveWith" : "fn 6/21/2016 23:53",
"testTravisDetection" : "fn 10/21/2016 19:19",
Expand Down

0 comments on commit a7bab32

Please sign in to comment.