aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml16
1 files changed, 4 insertions, 12 deletions
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