Update bundle

[rails.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4d764d6ed3e45ab9fbd0770c6c2ff7147942153f..996495c0dde16fe946a40b20f0d041a40aa8584e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ addons:
   postgresql: 9.5
   apt:
     packages:
   postgresql: 9.5
   apt:
     packages:

-      - postgresql-server-dev-9.5

       - libarchive-dev
 services:
   - memcached
       - libarchive-dev
 services:
   - memcached


@@ -16,15 +15,12 @@ env:
   global:
     - OSM_MEMCACHE_SERVERS="127.0.0.1"
 before_script:
   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
   - 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/travis.database.yml config/database.yml

+  - cp config/example.storage.yml config/storage.yml

   - touch config/settings.local.yml
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export
   - touch config/settings.local.yml
   - bundle exec rake db:migrate
   - bundle exec rake i18n:js:export


@@ -34,6 +30,6 @@ script:
   - bundle exec rake eslint
   - bundle exec erblint .
   - bundle exec rake db:structure:dump
   - bundle exec rake eslint
   - bundle exec erblint .
   - bundle exec rake db:structure:dump

-  - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "s/AS '.*libpgosm.*',/AS 'libpgosm',/" -e "/^--/d" db/structure.sql > db/structure.actual
+  - sed -e "/idle_in_transaction_session_timeout/d" -e 's/ IMMUTABLE / /' -e "/^--/d" db/structure.sql > db/structure.actual

   - diff -uw db/structure.expected db/structure.actual
   - bundle exec rake test:db
   - diff -uw db/structure.expected db/structure.actual
   - bundle exec rake test:db