X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/53cc1d2d11d358c171ee5beab55a3d20b79e9dab..ea68ac865ba4df5686ac111d4bd8679dc2a643a8:/.travis.yml diff --git a/.travis.yml b/.travis.yml index 0b528b469..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 @@ -27,5 +29,9 @@ before_script: - 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