Merge branch 'master' into dev

dalehenrich · Apr 13, 2017 · 72832a6 · 72832a6
2 parents 2a0a3e0 + 1859c1b
commit 72832a6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,9 @@ sudo: false
 
 os: linux
 
+install:
+  - pip install --user benchupload
+
 smalltalk_config: .smalltalk.ston
 
 smalltalk:
@@ -34,3 +37,9 @@ matrix:
 cache:
   directories:
     - $SMALLTALK_CI_CACHE
+
+# bob-bench xUnit file analysis
+after_success:
+  - benchupload --dir=$SMALLTALK_CI_BUILD
+after_failure:
+  - benchupload --dir=$SMALLTALK_CI_BUILD
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# tODE: the Object-centric Development Environment [![Build Status](https://travis-ci.org/dalehenrich/tode.png?branch=master)](https://travis-ci.org/dalehenrich/tode)
+# tODE: the Object-centric Development Environment [![Build Status](https://travis-ci.org/dalehenrich/tode.png?branch=master)](https://travis-ci.org/dalehenrich/tode) [![Test Status](https://api.bob-bench.org/v1/badgeByUrl?branch=master&hosting=github&ci=travis-ci&repo=dalehenrich%2Ftode)](https://bob-bench.org/r/gh/dalehenrich/tode)
 
 
 ## Installation and Setup

diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/instance/baseline..st b/repository/BaselineOfTode.package/BaselineOfTode.class/instance/baseline..st
@@ -336,7 +336,8 @@ baseline: spec
           with: [ spec requires: 'Topez-Server-DebugTools' ];
         yourself ].
   spec
-    for: #(#'gs3.3.1.x' #'gs3.3.2.x' #'gs3.3.3.x' #'gs3.4.x')
+    for:
+      #(#'gs3.3.1.x' #'gs3.3.2.x' #'gs3.3.3.x' #'gs3.3.4.x' #'gs3.3.5.x' #'gs3.4.x')
     do: [ 
       spec
         package: 'Tode-GemStone-Core331x'

diff --git a/repository/BaselineOfTode.package/BaselineOfTode.class/methodProperties.json b/repository/BaselineOfTode.package/BaselineOfTode.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 03/29/2017 14:22",
+		"baseline:" : "dkh 04/13/2017 13:03",
 		"initializeTools" : "dkh 06/06/2013 11:59",
 		"pharo30InstallFullTodeClient" : "dkh 05/16/2016 14:51",
 		"pharo30InstallTodeClient" : "dkh 10/10/2015 16:36" } }
diff --git a/repository/BaselineOfTode.package/monticello.meta/version b/repository/BaselineOfTode.package/monticello.meta/version