From ba812e52bd581d2dd17bc095dc9b4f8d79c78f42 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 16:57:00 -0400
Subject: initial travis test


diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e4f9ff7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,13 @@
+language: cpp
+compiler:
+  - gcc
+  - clang
+before_install:
+ - sudu apt-get update -qq
+ - sudu apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
+
+branches:
+  only:
+    - travis
+
+script: echo "Success"
-- 
cgit v0.10.1


From 1f6c61d9ce6baa31f86e0151519acd7df5f39ee8 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 17:00:13 -0400
Subject: typo


diff --git a/.travis.yml b/.travis.yml
index e4f9ff7..04d4728 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ compiler:
   - gcc
   - clang
 before_install:
- - sudu apt-get update -qq
- - sudu apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
 
 branches:
   only:
-- 
cgit v0.10.1


From cc1688cab89f1be54ff7cbd7f749033d4f26d44b Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 17:04:54 -0400
Subject: Script for kicking off Travis CI


diff --git a/.travis.yml b/.travis.yml
index 04d4728..786e1a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,4 @@ branches:
   only:
     - travis
 
-script: echo "Success"
+script: ./scripts/travis-ci.sh
diff --git a/scripts/travis-ci.sh b/scripts/travis-ci.sh
new file mode 100755
index 0000000..a5ea97f
--- /dev/null
+++ b/scripts/travis-ci.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+qmake
+make
+cd tests
+cmake .
+make
+ctest
-- 
cgit v0.10.1


From f8abd39095b0f75aa1f94db3c6e2ecd29bcd631f Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 17:16:21 -0400
Subject: Get OpenCSG from PPA


diff --git a/.travis.yml b/.travis.yml
index 786e1a8..2d526e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ compiler:
   - clang
 before_install:
  - sudo apt-get update -qq
- - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libopencsg-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
+ - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
+ - echo 'yes' | sudo add-apt-repository ppa:chrysn/openscad
+ - sudo apt-get install -qq libopencsg-dev 
 
 branches:
   only:
-- 
cgit v0.10.1


From e06dbbe7421ac2f7bd2f59710cae344665cd1bd7 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 17:22:22 -0400
Subject: Get OpenCSG from PPA - attempt 2


diff --git a/.travis.yml b/.travis.yml
index 2d526e9..040c5dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ compiler:
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
- - echo 'yes' | sudo add-apt-repository ppa:chrysn/openscad
+ - echo 'yes' | sudo add-apt-repository ppa:chrysn/opencsg
  - sudo apt-get install -qq libopencsg-dev 
 
 branches:
-- 
cgit v0.10.1


From acdf95002f919186f823effc75932814bc37eb64 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 17:32:53 -0400
Subject: Get OpenCSG from PPA - attempt 3


diff --git a/.travis.yml b/.travis.yml
index 040c5dc..f8c3fa7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,8 @@ compiler:
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
- - echo 'yes' | sudo add-apt-repository ppa:chrysn/opencsg
- - sudo apt-get install -qq libopencsg-dev 
+ - echo 'yes' | sudo add-apt-repository ppa:chrysn/openscad
+ - sudo apt-get update -qq libopencsg-dev 
 
 branches:
   only:
-- 
cgit v0.10.1


From 2b966f92f247d50f2b3201d492ebc167302fc1bf Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 18:22:06 -0400
Subject: Get OpenCSG from PPA - attempt 4


diff --git a/.travis.yml b/.travis.yml
index f8c3fa7..7c9bdd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@ compiler:
   - gcc
   - clang
 before_install:
+ - echo 'yes' | sudo add-apt-repository ppa:chrysn/openscad
  - sudo apt-get update -qq
  - sudo apt-get install -qq build-essential libqt4-dev libqt4-opengl-dev libxmu-dev cmake bison flex git-core libboost-all-dev libXi-dev libmpfr-dev libboost-dev libglew-dev libeigen2-dev libeigen3-dev libcgal-dev libgmp3-dev libgmp-dev python-paramiko curl imagemagick
- - echo 'yes' | sudo add-apt-repository ppa:chrysn/openscad
- - sudo apt-get update -qq libopencsg-dev 
+ - sudo apt-get install -qq libopencsg-dev
 
 branches:
   only:
-- 
cgit v0.10.1


From d37cb95e2ede85193e3f3f5004095964cedc0d35 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 19:32:54 -0400
Subject: Detect errors mid-way into test run


diff --git a/scripts/travis-ci.sh b/scripts/travis-ci.sh
index a5ea97f..8aa5d1e 100755
--- a/scripts/travis-ci.sh
+++ b/scripts/travis-ci.sh
@@ -1,8 +1,23 @@
 #!/bin/bash
 
-qmake
-make
+qmake && make
+if [[ $? != 0 ]]; then
+  echo "Error building OpenSCAD executable"
+  exit 1
+fi
 cd tests
-cmake .
+cmake . 
+if [[ $? != 0 ]]; then
+  echo "Error configuring test suite"
+  exit 1
+fi
 make
+if [[ $? != 0 ]]; then
+  echo "Error building test suite"
+  exit 1
+fi
 ctest
+if [[ $? != 0 ]]; then
+  echo "Test failure"
+  exit 1
+fi
-- 
cgit v0.10.1


From 7d667b1025da27902f17dea7a85c55c830050c21 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 21:53:20 -0300
Subject: Update README.md


diff --git a/README.md b/README.md
index c22871a..293efbb 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+![Travis CI](https://api.travis-ci.org/openscad/openscad.png)
+
 # What is OpenSCAD?
 [![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=openscad&url=http://openscad.org&title=OpenSCAD&language=&tags=github&category=software)
 
-- 
cgit v0.10.1


From 9e55b312651f9ef94e91ea5b0fa58fff44fe17fe Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 21:14:24 -0400
Subject: clang not yet supported by the travis script


diff --git a/.travis.yml b/.travis.yml
index 7c9bdd2..9442ca4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: cpp
 compiler:
   - gcc
-  - clang
 before_install:
  - echo 'yes' | sudo add-apt-repository ppa:chrysn/openscad
  - sudo apt-get update -qq
-- 
cgit v0.10.1


From 83dc80ff5f1dbf30fff8d7f263d47d7f70832bd4 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 13 May 2013 21:14:34 -0400
Subject: Parallel build


diff --git a/scripts/travis-ci.sh b/scripts/travis-ci.sh
index 8aa5d1e..6f9868d 100755
--- a/scripts/travis-ci.sh
+++ b/scripts/travis-ci.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-qmake && make
+qmake && make -j4
 if [[ $? != 0 ]]; then
   echo "Error building OpenSCAD executable"
   exit 1
@@ -11,12 +11,12 @@ if [[ $? != 0 ]]; then
   echo "Error configuring test suite"
   exit 1
 fi
-make
+make -j4
 if [[ $? != 0 ]]; then
   echo "Error building test suite"
   exit 1
 fi
-ctest
+ctest -j8
 if [[ $? != 0 ]]; then
   echo "Test failure"
   exit 1
-- 
cgit v0.10.1


From 435e0c021c5018ee5de69d3218c3e31c8ab75be5 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Wed, 30 Oct 2013 22:39:18 -0400
Subject: Limit parallel builds as Travis apparently runs out of memory


diff --git a/scripts/travis-ci.sh b/scripts/travis-ci.sh
index 6f9868d..9d4258a 100755
--- a/scripts/travis-ci.sh
+++ b/scripts/travis-ci.sh
@@ -11,7 +11,7 @@ if [[ $? != 0 ]]; then
   echo "Error configuring test suite"
   exit 1
 fi
-make -j4
+make -j2
 if [[ $? != 0 ]]; then
   echo "Error building test suite"
   exit 1
-- 
cgit v0.10.1