X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9508368d37fe6e9d54a2d51ed8d886261ec4a9e9..15865b5a8dcd48514b3eb00019502c28b0648caf:/.travis.yml diff --git a/.travis.yml b/.travis.yml index 7137c2268..996495c0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ addons: postgresql: 9.5 apt: packages: - - postgresql-server-dev-9.5 - libarchive-dev services: - memcached @@ -16,7 +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 + - sed -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.expected - psql -U postgres -c "CREATE DATABASE openstreetmap" - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap - psql -U postgres -f db/functions/functions.sql openstreetmap @@ -31,6 +30,6 @@ script: - bundle exec rake eslint - 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 + - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.actual - diff -uw db/structure.expected db/structure.actual - bundle exec rake test:db