X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ba627420a3e183fcee7ce38b2f68a0ff7663c647..18c5e1622577374cdd4535d2f06e9d51226ee974:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index e4c81e4c1..eed4575e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ addons:
   postgresql: 9.5
   apt:
     packages:
-      - postgresql-server-dev-9.5
       - libarchive-dev
 services:
   - memcached
@@ -16,14 +15,10 @@ env:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
-  - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "s/AS '.*libpgosm.*',/AS 'libpgosm',/" -e "/^--/d" db/structure.sql > db/structure.expected
+  - sed -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.expected
   - psql -U postgres -c "CREATE DATABASE openstreetmap"
   - psql -U postgres -c "CREATE EXTENSION btree_gist" openstreetmap
-  - make -C db/functions libpgosm.so
-  - ln db/functions/libpgosm.so /tmp
-  - psql -U postgres -c "CREATE FUNCTION maptile_for_point(int8, int8, int4) RETURNS int4 AS '/tmp/libpgosm', 'maptile_for_point' LANGUAGE C STRICT" openstreetmap
-  - psql -U postgres -c "CREATE FUNCTION tile_for_point(int4, int4) RETURNS int8 AS '/tmp/libpgosm', 'tile_for_point' LANGUAGE C STRICT" openstreetmap
-  - psql -U postgres -c "CREATE FUNCTION xid_to_int4(xid) RETURNS int4 AS '/tmp/libpgosm', 'xid_to_int4' LANGUAGE C STRICT" openstreetmap
+  - 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