diff options
| author | Marc Florisson | 2012-12-18 15:39:57 +0100 |
|---|---|---|
| committer | Marc Florisson | 2012-12-18 15:39:57 +0100 |
| commit | 3366e569f436cf1fab70d64320704cfe78bbad8e (patch) | |
| tree | 9208e6c9ceb6b29b9760200bfbc83075e93f0f86 /.travis.yml | |
| parent | 783a183886fe9bd5a355cb08d18da43a3cc129eb (diff) | |
| parent | af311cd2f3b20c39b2b5f78fb4001406b4daae53 (diff) | |
| download | chouette-core-3366e569f436cf1fab70d64320704cfe78bbad8e.tar.bz2 | |
Merge branch 'master' into api_key
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index bc8a4c271..7ca1a3e9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,24 @@ language: ruby rvm: - 1.8.7 - jruby-18mode - +jdk: + - oraclejdk7 + - openjdk7 + - openjdk6 +matrix: + 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: - - "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:db_travis_config" + - "rake db:create" + - "rake apartment:migrate" script: "rake spec" -notifications: - recipients: - - luc.donnet@dryade.net
\ No newline at end of file +branches: + only: + - master + - production
\ No newline at end of file |