From: Tom Hughes <tom@compton.nu>
Date: Mon, 30 Dec 2019 21:17:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2473'
X-Git-Tag: live~2895
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/dcd55590709ab18657cdbe5ab4ddd5e360ba6b43?hp=--cc

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

dcd55590709ab18657cdbe5ab4ddd5e360ba6b43
diff --cc .travis.yml
index db9128412,fbb8b46ab..b950b1e18
--- a/.travis.yml
+++ b/.travis.yml
@@@ -9,8 -9,14 +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"