X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5e42165d37b5ac1b3a8c988c42b9f271f67e90d8..083375b3c33f6aae6d81b17f12318e80e5c992db:/.travis.yml diff --git a/.travis.yml b/.travis.yml index 8e61677fd..e4c81e4c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,14 @@ addons: 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 @@ -23,11 +25,16 @@ 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 + - cp config/example.storage.yml config/storage.yml - touch config/settings.local.yml - bundle exec rake db:migrate - bundle exec rake i18n:js:export + - bundle exec rake yarn:install script: - bundle exec rubocop -f fuubar - - bundle exec rake eslint:run_all + - 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 + - diff -uw db/structure.expected db/structure.actual - bundle exec rake test:db