#3032 force eol to be unix LF for this file and accept mwtoews patch (I'm going to...

git-svn-id: http://svn.osgeo.org/postgis/trunk@13208 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/.travis.yml b/.travis.yml
index c856c0de67cf8af9f71aab5e4f287447b290e785..0ffa6fd8a3347cc1207d03591927b9359003e00b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,29 @@
-env:\r
-  global:\r
-    - PGUSER=postgres\r
-    - RUNTESTFLAGS=-v\r
-before_install:\r
-  #- rm .travis.yml\r
-  - sudo apt-get update\r
-  #- apt-cache search libgdal\r
-  - sudo apt-get purge -q postgresql-9.3 postgresql-9.2 postgresql-9.1-postgis-scripts postgresql-9.2-postgis-scripts postgresql-9.3-postgis-scripts postgresql-client postgresql-client-9.2  postgresql-client-9.3 liblwgeom-2.1.3 postgis\r
-  - sudo apt-get autoremove -q --purge\r
-  - sudo apt-get install -q build-essential flex autoconf libtool gfortran postgresql-server-dev-9.1 postgresql-client-9.1 postgresql-9.1 xsltproc libjson0-dev libproj-dev dblatex xsltproc libcunit1-dev libcunit1 docbook-xsl docbook-mathml libgdal-dev libgeos-dev\r
-  - dpkg -l | grep postgresql\r
-  - git config --global user.name "PostGIS Travis CI"\r
-  - git config --global user.email $HOSTNAME":not-for-mail@travis-ci.org"\r
-  - ./autogen.sh\r
-language: c\r
-compiler:\r
-  - gcc\r
-notifications:\r
-  email: false\r
-  irc:\r
-    channels:\r
-      - "irc.freenode.org#postgis"\r
-    on_success: change\r
-    on_failure: always\r
-    use_notice: false\r
-#after_failure:\r
-#  - cat /tmp/pgis_reg/*\r
+env:
+  global:
+    - RUNTESTFLAGS=-v
+
+addons:
+  postgresql: "9.4"
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y
+      postgresql-9.4 postgresql-server-dev-9.4
+      build-essential autoconf libtool libcunit1-dev
+      xsltproc docbook-xsl docbook-mathml dblatex
+      libproj-dev libgdal-dev libgeos-dev libjson0-dev
+  - dpkg -l | grep postgresql
+  - ./autogen.sh
+
+language: c
+
+compiler: gcc
+
+notifications:
+  email: false
+  irc:
+    channels:
+      - "irc.freenode.org#postgis"
+    on_success: change
+    on_failure: always
+    use_notice: false