Merge remote-tracking branch 'upstream/pull/2257'

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8ef7d57819aa0632e738bf25b840b2e3b5bd032c..c4767c64dda424cbbf922e0840127cc26c323762 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,22 @@
-sudo: false
+dist: xenial
 language: ruby
 rvm:
   - 2.5.3
-cache: bundler
+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
@@ -27,5 +30,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