Support for PG11

- Start using Docker to test in TravisCI
- Support for PG10 and PG11 and remove support for old versions
This commit is contained in:
Mario de Frutos Dieguez 2019-04-10 16:44:55 +02:00
parent ccbc73cd6c
commit a0b2c86645
No known key found for this signature in database
GPG Key ID: C9738009A2E89223
4 changed files with 25 additions and 21 deletions

View File

@ -1,23 +1,11 @@
language: c language: generic
group: travis_stable
sudo: required sudo: required
env: env:
global:
- PAGER=cat
matrix: matrix:
include: - DOCKER_IMAGE=carto/postgresql10:latest
- env: PGSQL_VERSION=9.6 POSTGIS_VERSION=2.3 - DOCKER_IMAGE=carto/postgresql11:latest
- env: PGSQL_VERSION=10 POSTGIS_VERSION=2.4 services:
- docker
before_install: before_install: docker pull ${DOCKER_IMAGE}
- sudo bash $TRAVIS_BUILD_DIR/scripts/ci/install_postgres.sh
- sudo make clean-all
install:
- sudo make install
script: script:
- cd src/pg - ./scripts/ci/docker-test.sh ${DOCKER_IMAGE}
- make test || { cat $TRAVIS_BUILD_DIR/src/pg/test/regression.diffs; false; }

4
scripts/ci/docker-test.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
docker run -e PGHOST=localhost -e PGPORT=5432 -v `pwd`:/srv --entrypoint="/bin/bash" ${1} /srv/scripts/ci/run_tests_docker.sh && \
docker ps --filter status=dead --filter status=exited -aq | xargs docker rm -v

View File

@ -0,0 +1,12 @@
#!/bin/bash
/etc/init.d/postgresql start
cd /srv
make clean-all
make install
cd /srv/src/pg
make test || { cat /srv/src/pg/test/regression.diffs; false; }

View File

@ -246,7 +246,7 @@ us.census.tiger.county|295
column_id|_obs_geometryscores_numgeoms_2500km_buffer column_id|_obs_geometryscores_numgeoms_2500km_buffer
us.census.tiger.block_group|165852 us.census.tiger.block_group|165852
us.census.tiger.census_tract|55283 us.census.tiger.census_tract|55283
us.census.tiger.zcta5|27046 us.census.tiger.zcta5|26529
us.census.tiger.county|2551 us.census.tiger.county|2551
(4 rows) (4 rows)
_obs_geometryscores_500km_buffer_50_geoms _obs_geometryscores_500km_buffer_50_geoms