Fix new erblint warnings

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index eed4575e5dfa5399ce0184826a8144b752ee2dd1..ce0a625ec42b50adc741fb96d1952b37845a79c0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic

 language: ruby
 rvm:
   - 2.5.3
 language: ruby
 rvm:
   - 2.5.3


@@ -8,12 +8,13 @@ addons:
   postgresql: 9.5
   apt:
     packages:
   postgresql: 9.5
   apt:
     packages:

+      - firefox-geckodriver

       - libarchive-dev
       - libarchive-dev

+      - libgd-dev
+      - libffi-dev
+      - libbz2-dev

 services:
   - memcached
 services:
   - memcached

-env:
-  global:
-    - OSM_MEMCACHE_SERVERS="127.0.0.1"

 before_script:
   - sed -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.expected
   - psql -U postgres -c "CREATE DATABASE openstreetmap"
 before_script:
   - sed -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.expected
   - psql -U postgres -c "CREATE DATABASE openstreetmap"


@@ -22,6 +23,7 @@ before_script:
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml
   - touch config/settings.local.yml
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml
   - touch config/settings.local.yml

+  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings/test.local.yml

   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - bundle exec rake yarn:install
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - bundle exec rake yarn:install


@@ -30,6 +32,6 @@ script:
   - bundle exec rake eslint
   - bundle exec erblint .
   - bundle exec rake db:structure:dump
   - 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
+  - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.actual

   - diff -uw db/structure.expected db/structure.actual
   - bundle exec rake test:db
   - diff -uw db/structure.expected db/structure.actual
   - bundle exec rake test:db