Ignore warnings and conflicts

hpi-swa · Feb 22, 2016 · 0a1f772 · 0a1f772
1 parent 6d02f34
commit 0a1f772
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pharo/run.sh b/pharo/run.sh
@@ -177,10 +177,11 @@ pharo::load_and_test_project() {
     timer_start
 
     "${SMALLTALK_CI_VM}" "${SMALLTALK_CI_IMAGE}" eval --save "
-      Metacello new
-        baseline: 'SmalltalkCI';
-        repository: 'filetree://${SMALLTALK_CI_HOME}/repository';
-        load.
+      [ Metacello new
+          baseline: 'SmalltalkCI';
+          repository: 'filetree://${SMALLTALK_CI_HOME}/repository';
+          onConflict: [:ex | ex pass];
+          load ] on: Warning do: [:w | w resume ].
       (Smalltalk at: #SmalltalkCI) runCIFor: '${project_home}/${SMALLTALK_CI_DEFAULT_CONFIG}'
     " || status=$?
 

diff --git a/squeak/run.sh b/squeak/run.sh
@@ -203,10 +203,11 @@ squeak::load_and_test_project() {
     fi
 
     cat >$SMALLTALK_CI_BUILD/run.st <<EOL
-  Metacello new
+  [ Metacello new
     baseline: 'SmalltalkCI';
     repository: 'filetree://${SMALLTALK_CI_HOME}/repository';
-    load.
+    onConflict: [:ex | ex pass];
+    load ] on: Warning do: [:w | w resume ].
   SmalltalkCI runCIFor: '${config_project_home}/${SMALLTALK_CI_DEFAULT_CONFIG}'
 EOL