From 97991734995dd532bac7a0787819762b71d4efff Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 11:05:24 +0100
Subject: Disable Cext for jruby

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index bc8a4c271..54c6213f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,9 @@ before_script:
   - "psql -c 'create database chouette_test;' -U postgres"
   - "rake ci:prepare_travis"
 script: "rake spec"
+env:
+  - JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+  - JRUBY_OPTS="--1.9 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
 notifications:
   recipients:
     - luc.donnet@dryade.net
\ No newline at end of file
-- 
cgit v1.2.3


From ef603026e355af081298b631c53265eb1d399d63 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 11:17:19 +0100
Subject: Add matrix environment for jruby in travis

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 54c6213f3..d53bf2dc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,9 @@ before_script:
   - "psql -c 'create database chouette_test;' -U postgres"
   - "rake ci:prepare_travis"
 script: "rake spec"
-env:
-  - JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-  - JRUBY_OPTS="--1.9 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
+matrix:
+  include:
+    - { rvm: jruby-18mode, env: JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false" }
 notifications:
   recipients:
     - luc.donnet@dryade.net
\ No newline at end of file
-- 
cgit v1.2.3


From f284baa550fdcbdf42ab90336af19243d7205eeb Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 11:32:45 +0100
Subject: Add branch to travis configuration

---
 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index d53bf2dc7..c86c8333f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,20 @@ language: ruby
 rvm:
   - 1.8.7
   - jruby-18mode
-
+before_install:
+  - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
-  - "sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev"
   - "psql -c 'create database chouette_test;' -U postgres"
-  - "rake ci:prepare_travis"
+  - rake ci:prepare_travis
 script: "rake spec"
+branches:
+  only:
+    - master
+    - production
 matrix:
   include:
-    - { rvm: jruby-18mode, env: JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false" }
+    - rvm: jruby-18mode
+      env: JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
 notifications:
   recipients:
     - luc.donnet@dryade.net
\ No newline at end of file
-- 
cgit v1.2.3


From 948290ec960da8dac519adc931f114d61586582d Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 13:46:04 +0100
Subject: Add databases for travis test

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index c86c8333f..a81440cf9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
 language: ruby
 rvm:
   - 1.8.7
-  - jruby-18mode
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
   - "psql -c 'create database chouette_test;' -U postgres"
+  - "psql -c 'create database chouette_production_test;' -U postgres"
+  - "psql -c 'create database jdbc_chouette_test;' -U postgres"
+  - "psql -c 'create database jdbc_chouette_production_test;' -U postgres"
   - rake ci:prepare_travis
 script: "rake spec"
 branches:
-- 
cgit v1.2.3


From 9b20cc52ee2dff4cc306b448dbbc7b688c1aae4a Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 14:59:09 +0100
Subject: Delete development database for travis

---
 .travis.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index a81440cf9..5adbb9b48 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,15 @@
 language: ruby
 rvm:
   - 1.8.7
+  - jruby-18mode
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
   - "psql -c 'create database chouette_test;' -U postgres"
   - "psql -c 'create database chouette_production_test;' -U postgres"
-  - "psql -c 'create database jdbc_chouette_test;' -U postgres"
-  - "psql -c 'create database jdbc_chouette_production_test;' -U postgres"
-  - rake ci:prepare_travis
-script: "rake spec"
+  - "RAILS_ENV=test rake ci:prepare_travis"
+script: "RAILS_ENV=test rake spec"
 branches:
   only:
     - master
-    - production
-matrix:
-  include:
-    - rvm: jruby-18mode
-      env: JRUBY_OPTS="--1.8 --server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-notifications:
-  recipients:
-    - luc.donnet@dryade.net
\ No newline at end of file
+    - production
\ No newline at end of file
-- 
cgit v1.2.3


From 87f19b42235d7d59a3ee65360d6c9137825fdeb2 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 16:04:48 +0100
Subject: Use rake for create database

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 5adbb9b48..d736e4950 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,9 @@ rvm:
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
-  - "psql -c 'create database chouette_test;' -U postgres"
-  - "psql -c 'create database chouette_production_test;' -U postgres"
-  - "RAILS_ENV=test rake ci:prepare_travis"
-script: "RAILS_ENV=test rake spec"
+  - "rake db:create"
+  - "rake ci:prepare_travis"
+script: "rake spec"
 branches:
   only:
     - master
-- 
cgit v1.2.3


From 0c431b2ff6cc8f7623e5245064700c508eca1648 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 16:06:57 +0100
Subject: Fix order for before scripts

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index d736e4950..9c6fc3112 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,9 @@ rvm:
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
+  - "rake ci:db_travis_config"
   - "rake db:create"
-  - "rake ci:prepare_travis"
+  - "rake apartment:migrate"
 script: "rake spec"
 branches:
   only:
-- 
cgit v1.2.3


From 3c33aef7e0326e8406b63983c90db1399d9842b8 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 16:19:19 +0100
Subject: Add different jdk for jruby

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 9c6fc3112..a90d815f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ language: ruby
 rvm:
   - 1.8.7
   - jruby-18mode
+jdk:
+  - oraclejdk7
+  - openjdk7
+  - openjdk6
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
-- 
cgit v1.2.3


From c22b730ab041e4c90e6e320cd2da5e72a94c6787 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 16:21:14 +0100
Subject: Add matrix exclusion for ruby 1.8

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index a90d815f2..16470fe5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,14 @@ jdk:
   - oraclejdk7
   - openjdk7
   - openjdk6
+matrix:
+  exclude:
+- rvm:  1.8.7
+  jdk: openjdk6
+- rvm:  1.8.7
+  jdk: openjdk7
+- rvm:  1.8.7
+  jdk: oraclejdk7
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
-- 
cgit v1.2.3


From ba6e72721a2b585147004265650db9937788301a Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 16:47:19 +0100
Subject: Fix caracter encoding bug with jruby

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 16470fe5c..2ef530d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,6 @@ jdk:
   - openjdk6
 matrix:
   exclude:
-- rvm:  1.8.7
-  jdk: openjdk6
 - rvm:  1.8.7
   jdk: openjdk7
 - rvm:  1.8.7
-- 
cgit v1.2.3


From 5523ca7a3b9e2e45dd4f7c9b463a1fab3d12b057 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 17 Dec 2012 16:51:25 +0100
Subject: Fix indentation in travis

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 2ef530d27..7ca1a3e9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,11 @@ jdk:
   - openjdk7
   - openjdk6
 matrix:
-  exclude:
-- rvm:  1.8.7
-  jdk: openjdk7
-- rvm:  1.8.7
-  jdk: oraclejdk7
+  exclude: 
+    - rvm:  1.8.7
+      jdk: openjdk7
+    - rvm:  1.8.7
+      jdk: oraclejdk7
 before_install:
   - sudo apt-get install build-essential ruby-dev libproj-dev libgeos-dev libffi-dev libsparsehash-dev zlib1g-dev libxslt1-dev libxml2-dev libbz2-dev
 before_script: 
-- 
cgit v1.2.3