X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/670603e927b3387d3a8a062a98d8885326119dea..d9b8ebeb01e6cf81f6d9ea70748fedb14e4d86fa:/.travis.yml diff --git a/.travis.yml b/.travis.yml index a0ed70c19..c4767c64d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,22 @@ -sudo: false +dist: xenial language: ruby rvm: - - 2.5.1 -cache: bundler + - 2.5.3 +cache: + - bundler addons: postgresql: 9.5 apt: packages: - postgresql-server-dev-9.5 + - libarchive-dev services: - memcached 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 +32,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