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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index db9128412bc006d921684bd2764af1725293debf..31f4aec537856ac9ed3e2a8bc0de3903f792a79b 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


@@ -9,6 +9,9 @@ addons:
   apt:
     packages:
       - libarchive-dev
   apt:
     packages:
       - libarchive-dev

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

 services:
   - memcached
 before_script:
 services:
   - memcached
 before_script:


@@ -18,7 +21,8 @@ before_script:
   - psql -U postgres -f db/functions/functions.sql openstreetmap
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml
   - psql -U postgres -f db/functions/functions.sql openstreetmap
   - cp config/travis.database.yml config/database.yml
   - cp config/example.storage.yml config/storage.yml

-  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings.local.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