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

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 78f36a5a16b7af1db650c21887288b03775945f1..31f4aec537856ac9ed3e2a8bc0de3903f792a79b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,11 +9,11 @@ addons:
   apt:
     packages:
       - libarchive-dev
+      - libgd-dev
+      - libffi-dev
+      - libbz2-dev
 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"
@@ -22,6 +22,7 @@ before_script:
   - 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