X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/25d89a63cbaa359e26aee27cb91dd702e1120989..90ac07d071ed8dbfdea6214419e1b5205a529b2f:/.travis.yml?ds=inline diff --git a/.travis.yml b/.travis.yml index 1738201b7..459c36f4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ -sudo: false +dist: xenial language: ruby rvm: - - 2.3.3 -cache: bundler + - 2.5.3 +cache: + - bundler addons: postgresql: 9.5 apt: @@ -14,6 +15,7 @@ env: global: - OSM_MEMCACHE_SERVERS="127.0.0.1" before_script: + - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "s/AS '.*libpgosm.*',/AS 'libpgosm',/" -e "/^--/d" db/structure.sql > db/structure.expected - psql -U postgres -c "CREATE DATABASE openstreetmap" - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap - make -C db/functions libpgosm.so @@ -22,9 +24,14 @@ before_script: - 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 + - touch config/settings.local.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 eslint:run_all + - bundle exec erblint . + - bundle exec rake db:structure:dump + - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "s/AS '.*libpgosm.*',/AS 'libpgosm',/" -e "/^--/d" db/structure.sql > db/structure.actual + - diff -uw db/structure.expected db/structure.actual - bundle exec rake test:db