Whitespace fixes for oauth_clients erb files

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 48ddb4a1d09d4e3f1ca0b508c123ee39b0a96b31..1b99a514375447cc93ad5b9606f3d0063a67c593 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.5.1

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


@@ -14,7 +14,6 @@ env:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:

-  - cp config/example.application.yml config/application.yml

   - 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


@@ -23,7 +22,9 @@ 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
   - 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 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