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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1738201b703035071ca38d7890431eac38ae618d..a0ed70c19601565c24634c0e5ecbc6f2bc34757f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
+  - 2.5.1
 cache: bundler
 addons:
   postgresql: 9.5
@@ -22,9 +22,11 @@ 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
+  - 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 jshint
+  - bundle exec rake eslint:run_all
+  - bundle exec erblint .
   - bundle exec rake test:db