Skip to content

Commit

Permalink
#176 add explicit Warning handler for onWarningLog ... allow older ve…
Browse files Browse the repository at this point in the history
…rsions of Metacello to continue to be used
  • Loading branch information
dalehenrich committed Jul 7, 2016
1 parent 74da09c commit 2ad7502
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 17 deletions.
3 changes: 2 additions & 1 deletion .smalltalk.ston
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ SmalltalkCISpec {
#baseline : 'SmalltalkCI',
#directory : 'repository',
#load : [ 'tests' ],
#onWarningLog : true,
#platforms : [ #squeak, #pharo, #gemstone ]
}
],
Expand All @@ -18,4 +19,4 @@ SmalltalkCISpec {
#classes : [ #SentButNotImplementedTest, #UndefinedSymbolsTest ]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
executing
basicLoadProjectOn: aSmalltalkCI
| metacello |
aSmalltalkCI class requireMetacello.
metacello := (Smalltalk at: #Metacello) new.
self onWarningLog
ifTrue: [ metacello onWarningLog ].
metacello
repository: (self loadRepositoryFor: aSmalltalkCI);
baseline: self baseline;
configuration: self configuration;
version: self version.
metacello copy get. "compensate for older versions of Metacello"
aSmalltalkCI performMetacelloLoad: [ metacello load: self load ]
| metacello baseBlock loadBlock |
aSmalltalkCI class requireMetacello.
metacello := (Smalltalk at: #'Metacello') new.
self onWarningLog
ifTrue: [ metacello onWarningLog ].
metacello
repository: (self loadRepositoryFor: aSmalltalkCI);
baseline: self baseline;
configuration: self configuration;
version: self version.
metacello copy get. "compensate for older versions of Metacello"
baseBlock := [ metacello load: self load ].
loadBlock := self onWarningLog
ifTrue: [
loadBlock := [
"compensate for older versions of Metacello"
baseBlock
on: Warning
do: [ :ex |
Transcript
cr;
show: ex description.
ex resume ] ] ]
ifFalse: [ baseBlock ].
aSmalltalkCI performMetacelloLoad: loadBlock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"instance" : {
"baseline" : "fn 1/10/2016 11:44",
"baseline:" : "fn 1/10/2016 11:44",
"basicLoadProjectOn:" : "fn 4/14/2016 21:15",
"basicLoadProjectOn:" : "dkh 07/07/2016 06:49",
"configuration" : "fn 1/10/2016 11:45",
"configuration:" : "fn 1/10/2016 11:44",
"directory" : "fniep 1/10/2016 17:54",
Expand All @@ -23,5 +23,5 @@
"prepareForCI" : "TravisCI 6/13/2016 11:45",
"repository" : "fn 1/10/2016 11:44",
"repository:" : "fn 1/10/2016 11:44",
"version" : "fn 2/20/2016 21:25",
"version:" : "fn 2/20/2016 21:25" } }
"version" : "TravisCI 2/20/2016 21:25",
"version:" : "TravisCI 2/20/2016 21:25" } }

Large diffs are not rendered by default.

0 comments on commit 2ad7502

Please sign in to comment.