From 90180d48670fc8b9061ceb1458c8993b80f1e66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= <git@rmr.ninja>
Date: Thu, 9 Apr 2020 11:21:47 +0200
Subject: [PATCH] Travis: Use pure travis and add PG12

---
 .travis.yml | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 724249029..d7e68ebd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,32 @@
-language: generic
-sudo: required
-env:
-  matrix:
-    - NODE_VERSION=10.15.1
-      DOCKER_IMAGE=carto/nodejs-xenial-pg101:latest
-    - NODE_VERSION=10.15.1
-      DOCKER_IMAGE=carto/nodejs-xenial-pg1121:latest
-services:
-  - docker
-before_install: docker pull ${DOCKER_IMAGE}
-script: npm run test:docker
+sudo: false
+
+language: node_js
+
+node_js:
+  - "10"
+
+jobs:
+  include:
+    - env: POSTGRESQL_VERSION="10" POSTGIS_VERSION="2.4"
+      dist: xenial
+    - env: POSTGRESQL_VERSION="11" POSTGIS_VERSION="2.5"
+      dist: xenial
+    - env: POSTGRESQL_VERSION="12" POSTGIS_VERSION="3"
+      dist: bionic
+
+install:
+ - npm ci
+
+script:
+  - if [[ $POSTGRESQL_VERSION == '10' ]]; then sudo add-apt-repository -y ppa:cartodb/gis; fi;
+  - sudo add-apt-repository -y ppa:cartodb/postgresql-$POSTGRESQL_VERSION
+  - sudo apt-get -q update
+  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests postgresql-$POSTGRESQL_VERSION postgresql-client-$POSTGRESQL_VERSION postgresql-server-dev-$POSTGRESQL_VERSION postgresql-common postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION-scripts postgis
+  - sudo pg_dropcluster --stop $POSTGRESQL_VERSION main
+  - sudo rm -rf /etc/postgresql/$POSTGRESQL_VERSION /var/lib/postgresql/$POSTGRESQL_VERSION /var/ramfs/postgresql/$POSTGRESQL_VERSION
+  - sudo pg_createcluster -u postgres $POSTGRESQL_VERSION main --start -p 5432 -- --auth-local trust
+  - npm test
+
+after_failure:
+  - pg_lsclusters
+  - sudo cat /var/log/postgresql/postgresql-$POSTGRESQL_VERSION-main.log