Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index e4f7390936762ad0c41a3abd09aa2350f2d6393f..3b56d2b4b666af3b77fb9df25838a6259b0def03 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,31 @@
 sudo: false
 language: ruby
 rvm:
 sudo: false
 language: ruby
 rvm:

-  - 1.9.3
+  - 2.3.3

 cache: bundler
 addons:
 cache: bundler
 addons:

-  postgresql: 9.1
+  postgresql: 9.5

   apt:
     packages:
   apt:
     packages:

-      - postgresql-server-dev-9.1
+      - postgresql-server-dev-9.5

 services:
   - memcached
 env:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
 services:
   - memcached
 env:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:

+  - cp config/example.application.yml config/application.yml

   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
   - make -C db/functions libpgosm.so
   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
   - make -C db/functions libpgosm.so

-  - psql -U postgres -c "CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '${PWD}/db/functions/libpgosm', 'maptile_for_point' LANGUAGE C STRICT" openstreetmap
-  - psql -U postgres -c "CREATE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '${PWD}/db/functions/libpgosm', 'tile_for_point' LANGUAGE C STRICT" openstreetmap
-  - psql -U postgres -c "CREATE FUNCTION xid_to_int4(xid) RETURNS int4 AS '${PWD}/db/functions/libpgosm', 'xid_to_int4' LANGUAGE C STRICT" openstreetmap
+  - ln db/functions/libpgosm.so /tmp
+  - psql -U postgres -c "CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '/tmp/libpgosm', 'maptile_for_point' LANGUAGE C STRICT" openstreetmap
+  - psql -U postgres -c "CREATE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '/tmp/libpgosm', 'tile_for_point' LANGUAGE C STRICT" openstreetmap
+  - psql -U postgres -c "CREATE FUNCTION xid_to_int4(xid) RETURNS int4 AS '/tmp/libpgosm', 'xid_to_int4' LANGUAGE C STRICT" openstreetmap

   - cp config/travis.database.yml config/database.yml
   - bundle exec rake db:migrate
   - cp config/travis.database.yml config/database.yml
   - bundle exec rake db:migrate

+  - bundle exec rake i18n:js:export

 script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake jshint
 script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake jshint

-  - bundle exec rake test
+  - bundle exec rake test:db