X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/62dff6ab7ff94c38b19208dd1423ad0be5cb9dcf..027728fede985ab729ae8f6f330ef6dbf7ea7acd:/.travis.yml diff --git a/.travis.yml b/.travis.yml index a0ed70c19..459c36f4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ -sudo: false +dist: xenial language: ruby rvm: - - 2.5.1 -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 @@ -29,4 +31,7 @@ script: - bundle exec rubocop -f fuubar - 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