X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/860887de5272c3e2a39cb7e0c9db6f0acba1b4c6..3b96bbc80976836c6783ddd81db2f93b7e3fa3a2:/.travis.yml diff --git a/.travis.yml b/.travis.yml index 6c41bc8b8..3b56d2b4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ sudo: false language: ruby rvm: - - 2.1.8 + - 2.3.3 cache: bundler addons: - postgresql: 9.1 + postgresql: 9.5 apt: packages: - - postgresql-server-dev-9.1 + - postgresql-server-dev-9.5 services: - memcached env: @@ -18,12 +18,14 @@ before_script: - 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 + - bundle exec rake i18n:js:export script: - bundle exec rubocop -f fuubar - bundle exec rake jshint - - bundle exec rake test + - bundle exec rake test:db