From 390a2b573f27736b3be56f7285ccf3e597ec991c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Mart=C3=ADn?= <oleurud@gmail.com>
Date: Fri, 27 Apr 2018 10:57:47 +0200
Subject: [PATCH] test last travis configuration previous to docker

---
 .travis.yml | 71 +++++++++++------------------------------------------
 1 file changed, 15 insertions(+), 56 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 723c161e..5cc487d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,70 +7,29 @@ jobs:
       language: generic
       before_install: docker pull cartoimages/engine-xenial-pg101
       script: docker run -e POSTGIS_VERSION=2.4 -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh
-    - dist: precise
+    - dist: trusty
       addons:
+        postgresql: "9.5"
         apt:
           sources:
-          - ubuntu-toolchain-r-test
+            - ubuntu-toolchain-r-test
           packages:
-          - g++-4.9
-          - gcc-4.9
-        postgresql: 9.5
+            - postgresql-9.5-postgis-2.3
+            - postgresql-plpython-9.5
+            - pkg-config
+            - libcairo2-dev
+            - libjpeg8-dev
+            - libgif-dev
+            - libpango1.0-dev
+            - g++-4.9
 
       before_install:
-        # Add custom PPAs from cartodb
-        - sudo add-apt-repository -y ppa:cartodb/postgresql-9.5
-        - sudo add-apt-repository -y ppa:cartodb/gis
-        - sudo add-apt-repository -y ppa:cartodb/gis-testing
-        - sudo apt-get update
-
-        # Force instalation of libgeos-3.5.0 (presumably needed because of existing version of postgis)
-        - sudo apt-get -y install libgeos-3.5.0=3.5.0-1cdb2
-
-        # Install postgres db and build deps
-        - sudo /etc/init.d/postgresql stop # stop travis default instance
-        - sudo apt-get -y remove --purge postgresql-9.1
-        - sudo apt-get -y remove --purge postgresql-9.2
-        - sudo apt-get -y remove --purge postgresql-9.3
-        - sudo apt-get -y remove --purge postgresql-9.4
-        - sudo apt-get -y remove --purge postgresql-9.5
-        - sudo apt-get -y remove --purge postgresql-9.6
-        - sudo rm -rf /var/lib/postgresql/
-        - sudo rm -rf /var/log/postgresql/
-        - sudo rm -rf /etc/postgresql/
-        - sudo apt-get -y remove --purge postgis-2.2
-        - sudo apt-get -y autoremove
-
-        - sudo apt-get -y install postgresql-9.5-postgis-scripts=2.2.2.0-cdb2
-        - sudo apt-get -y install postgresql-9.5=9.5.2-3cdb3 --allow-downgrades
-        - sudo apt-get -y install postgresql-server-dev-9.5=9.5.2-3cdb3
-        - sudo apt-get -y install postgresql-plpython-9.5=9.5.2-3cdb3 --allow-downgrades
-        - sudo apt-get -y install postgresql-9.5-postgis-2.2=2.2.2.0-cdb2
-        - sudo apt-get install -q gdal-bin
-        - sudo apt-get install -q ogr2ogr2-static-bin
-        - sudo apt-get install -y libc6
-
-        - wget http://download.redis.io/releases/redis-4.0.8.tar.gz
-        - tar xvzf redis-4.0.8.tar.gz
-        - cd redis-4.0.8
-        - make
-        - sudo make install
-        - cd ..
-        - rm redis-4.0.8.tar.gz
-        
-        # configure it to accept local connections from postgres
-        - echo -e "# TYPE  DATABASE        USER            ADDRESS                 METHOD \nlocal   all             postgres                                trust\nlocal   all             all                                     trust\nhost    all             all             127.0.0.1/32            trust" \
-          | sudo tee /etc/postgresql/9.5/main/pg_hba.conf
-        - sudo /etc/init.d/postgresql restart 9.5
-
-        - psql -c 'create database template_postgis;' -U postgres
-        - psql -c 'CREATE EXTENSION postgis;' -U postgres -d template_postgis
-        - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5
-        - export PATH="$HOME/.yarn/bin:$PATH"
-        - CC=gcc-4.9 CXX=g++-4.9 yarn
+        - createdb template_postgis
+        - createuser publicuser
+        - psql -c "CREATE EXTENSION postgis" template_postgis
 
       env:
-        - NPROCS=1 JOBS=1 PGUSER=postgres CC=gcc-4.9 CXX=g++-4.9
+        - NPROCS=1 JOBS=1 PGUSER=postgres CXX=g++-4.9
 
       language: node_js
       node_js: