integrate circleci

3 files changed, 26 insertions, 4 deletions

diff --git a/DEVELOPER_GUIDE.txt b/DEVELOPER_GUIDE.txt
index 78b9963..0e20339 100644
--- a/DEVELOPER_GUIDE.txt
+++ b/DEVELOPER_GUIDE.txt
@@ -1,9 +1,8 @@
 Welcome developer.
 
-CBT has a very easy code base that you can fully master in under an hour.
-Don't shy away to submit PRs :).
-
-CBT launches in stages in order to bootstrap from source out of Java into Scala and finally CBT.
+CBT has a very easy code base that you can fully master it in an afternoon.
+Don't shy away from submiting PRs :). And because CBT bootstraps from source
+you already have the code there.
 
 The ./cbt bash script starts the process.
 
@@ -19,3 +18,9 @@ stage1/	            CBT's code that only relies only on Scala/Java built-ins. Co
 stage2/             CBT's code that requires additional libs, e.g. barbary watchservice.
 test/               Unit tests that can serve as example builds
 sonatype.login      Sonatype credentials for deployment. Not in git obviously.
+
+CBT follows an optimistic merging approach. (See http://hintjens.com/blog:106).
+We strongly suggest well polished PRs, but don't want to stall improvements
+by discussions about minor flaws. As long as the PR does not break anything and
+improves the product, we should merge it, polishing remaining things afterwards.
+
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..a8498b4
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,16 @@
+machine:
+  java:
+    version: oraclejdk8
+
+dependencies:
+  cache_directories:
+    - "bootstrap_scala/cache"
+    - "bootstrap_scala/target"
+    - "cache"
+    - "nailgun_launcher/target"
+    - "stage1/target"
+    - "stage2/target"
+        
+test:
+  override:
+    - ./cbt test
diff --git a/test/test.scala b/test/test.scala
index d684744..9ab5b4e 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -73,5 +73,6 @@ object Main{
 
     println(" DONE!")
     println(successes+" succeeded, "+ failures+" failed" )
+    if(failures > 0) System.exit(1) else System.exit(0)
   }
 }