Update to iD v2.14.1

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8ae3d114173e5e40050e84e056d8b9997b8845ae..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


@@ -15,8 +15,6 @@ env:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
   - cp config/example.application.yml config/application.yml
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
   - cp config/example.application.yml config/application.yml

-  - ruby -C lib/quad_tile extconf.rb
-  - make -C lib/quad_tile

   - 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


@@ -26,6 +24,7 @@ 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
 script:
   - bundle exec rubocop -f fuubar
   - bundle exec rake jshint