Fix spellings from aggree to agree

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1b99a514375447cc93ad5b9606f3d0063a67c593..4d764d6ed3e45ab9fbd0770c6c2ff7147942153f 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


@@ -25,7 +28,12 @@ before_script:
   - touch config/settings.local.yml
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - 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
 script:
   - bundle exec rubocop -f fuubar

-  - bundle exec rake jshint
+  - 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
   - bundle exec rake test:db