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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index a0ed70c19601565c24634c0e5ecbc6f2bc34757f..c4767c64dda424cbbf922e0840127cc26c323762 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,22 @@
-sudo: false
+dist: xenial

 language: ruby
 rvm:
 language: ruby
 rvm:

-  - 2.5.1
-cache: bundler
+  - 2.5.3
+cache:
+  - bundler

 addons:
   postgresql: 9.5
   apt:
     packages:
       - postgresql-server-dev-9.5
 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:
 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
   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
   - make -C db/functions libpgosm.so


@@ -29,4 +32,7 @@ script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake eslint:run_all
   - bundle exec erblint .
   - bundle exec rubocop -f fuubar
   - 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