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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index c4767c64dda424cbbf922e0840127cc26c323762..4d764d6ed3e45ab9fbd0770c6c2ff7147942153f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,9 +28,10 @@ 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 eslint:run_all
+  - 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
   - 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