From a0b2c86645e8e6bf080037f7abaa896a0a511c50 Mon Sep 17 00:00:00 2001
From: Mario de Frutos Dieguez <mario@defrutos.org>
Date: Wed, 10 Apr 2019 16:44:55 +0200
Subject: [PATCH] Support for PG11

- Start using Docker to test in TravisCI
- Support for PG10 and PG11 and remove support for old versions
---
 .travis.yml                                   | 28 ++++++-------------
 scripts/ci/docker-test.sh                     |  4 +++
 scripts/ci/run_tests_docker.sh                | 12 ++++++++
 .../42_observatory_exploration_test.out       |  2 +-
 4 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100755 scripts/ci/docker-test.sh
 create mode 100644 scripts/ci/run_tests_docker.sh

diff --git a/.travis.yml b/.travis.yml
index c28e5ea..4d59da3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,11 @@
-language: c
-group: travis_stable
+language: generic
 sudo: required
-
 env:
-  global:
-    - PAGER=cat
-
-matrix:
-  include:
-    - env: PGSQL_VERSION=9.6 POSTGIS_VERSION=2.3
-    - env: PGSQL_VERSION=10 POSTGIS_VERSION=2.4
-
-before_install:
-  - sudo bash $TRAVIS_BUILD_DIR/scripts/ci/install_postgres.sh
-  - sudo make clean-all
-
-install:
-  - sudo make install
-
+  matrix:
+    - DOCKER_IMAGE=carto/postgresql10:latest
+    - DOCKER_IMAGE=carto/postgresql11:latest
+services:
+  - docker
+before_install: docker pull ${DOCKER_IMAGE}
 script:
-  - cd src/pg
-  - make test || { cat $TRAVIS_BUILD_DIR/src/pg/test/regression.diffs; false; }
+  - ./scripts/ci/docker-test.sh ${DOCKER_IMAGE}
diff --git a/scripts/ci/docker-test.sh b/scripts/ci/docker-test.sh
new file mode 100755
index 0000000..8f67b94
--- /dev/null
+++ b/scripts/ci/docker-test.sh
@@ -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
diff --git a/scripts/ci/run_tests_docker.sh b/scripts/ci/run_tests_docker.sh
new file mode 100644
index 0000000..bd2a8a8
--- /dev/null
+++ b/scripts/ci/run_tests_docker.sh
@@ -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; }
diff --git a/src/pg/test/expected/42_observatory_exploration_test.out b/src/pg/test/expected/42_observatory_exploration_test.out
index 73a43b2..ea14763 100644
--- a/src/pg/test/expected/42_observatory_exploration_test.out
+++ b/src/pg/test/expected/42_observatory_exploration_test.out
@@ -246,7 +246,7 @@ us.census.tiger.county|295
 column_id|_obs_geometryscores_numgeoms_2500km_buffer
 us.census.tiger.block_group|165852
 us.census.tiger.census_tract|55283
-us.census.tiger.zcta5|27046
+us.census.tiger.zcta5|26529
 us.census.tiger.county|2551
 (4 rows)
 _obs_geometryscores_500km_buffer_50_geoms