Skip to content

Commit 0966dad

Browse files
committed
Less postgis voodoo on travis
1 parent c77db4f commit 0966dad

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ addons:
2323
postgresql: "9.1"
2424

2525
before_install:
26+
- export DEBIAN_FRONTEND=noninteractive
2627
- sudo add-apt-repository ppa:ubuntugis/ppa -y
2728
- sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y # For postgresql-9.1-postgis-2.1
2829
- sudo add-apt-repository ppa:smspillaz/cmake-3.0.2 -y
2930
- sudo add-apt-repository ppa:kedazo/doxygen-updates-precise -y # For doxygen 1.8.8
30-
- sudo rm -f /etc/apt/sources.list.d/pgdg-source.list # postgis from pgdg requires different gdal package than the grass package
3131
- sudo apt-get update -qq
32-
- sudo apt-get remove postgresql-9.1-postgis-2.1 # Remove postgis from pgdg, will install postgis from ubuntugis-unstable instead
33-
- sudo apt-get install --no-install-recommends
32+
- sudo apt-get install --force-yes --no-install-recommends --no-install-suggests
3433
bison cmake cmake-data doxygen flex git graphviz
3534
grass-dev libexpat1-dev libfcgi-dev libgdal1-dev
3635
libgeos-dev libgsl0-dev libpq-dev libproj-dev
@@ -41,7 +40,8 @@ before_install:
4140
python python-dev python-qt4 python-qt4-dev
4241
python-sip python-sip-dev spawn-fcgi txt2tags
4342
xauth xfonts-100dpi xfonts-75dpi xfonts-base
44-
xfonts-scalable xvfb postgresql-9.1-postgis-2.1
43+
xfonts-scalable xvfb
44+
postgresql-9.1-postgis-2.1/precise # postgis one from ubuntugis-unstable, not pgdg
4545
- cmake --version
4646
- clang --version
4747

0 commit comments

Comments
 (0)