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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8c09cc439edbafae4101d57741cdd29f031f351b..3b56d2b4b666af3b77fb9df25838a6259b0def03 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
 sudo: false
 language: ruby
 rvm:

-  - 2.3.1
+  - 2.3.3

 cache: bundler
 addons:
   postgresql: 9.5
 cache: bundler
 addons:
   postgresql: 9.5


@@ -24,8 +24,8 @@ before_script:
   - 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
   - bundle exec rake db:migrate
   - 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
   - bundle exec rake db:migrate

+  - bundle exec rake i18n:js:export

 script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake jshint
   - bundle exec rake test:db
 script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake jshint
   - bundle exec rake test:db

-  - bundle exec rake test:system