From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Dec 2019 00:50:34 +0000 (+0000)
Subject: Use settings.local.yml to enable memcache during travis runs
X-Git-Tag: live~2896
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c524cbf096d9f67936a5ec6050e5c83fd49077cd?ds=sidebyside;hp=-c

Use settings.local.yml to enable memcache during travis runs
---

c524cbf096d9f67936a5ec6050e5c83fd49077cd
diff --git a/.travis.yml b/.travis.yml
index 996495c0d..db9128412 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,6 @@ addons:
       - libarchive-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"
@@ -21,7 +18,7 @@ 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
-  - touch config/settings.local.yml
+  - echo -e "---\nmemcache_servers:\n  - 127.0.0.1" > config/settings.local.yml
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - bundle exec rake yarn:install