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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1738201b703035071ca38d7890431eac38ae618d..459c36f4fa2362245eb84734c97559ff6f4af8cf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,9 @@
-sudo: false
+dist: xenial

 language: ruby
 rvm:
 language: ruby
 rvm:

-  - 2.3.3
-cache: bundler
+  - 2.5.3
+cache:
+  - bundler

 addons:
   postgresql: 9.5
   apt:
 addons:
   postgresql: 9.5
   apt:


@@ -14,6 +15,7 @@ env:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
   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
   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
   - make -C db/functions libpgosm.so


@@ -22,9 +24,14 @@ 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
   - 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

+  - touch config/settings.local.yml

   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
 script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake db:migrate
   - 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
   - bundle exec rake test:db