From: Sarah Hoffmann Date: Sun, 10 Feb 2019 16:20:06 +0000 (+0100) Subject: Merge pull request #1305 from mtmail/travis-ci-ubuntu-16 X-Git-Tag: v3.3.0~32 X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/89a888de768cc0f4fc6df3f30f00fafb5c09d268?hp=bfb20aaa4722fd16682a11143c1ba842f401e145 Merge pull request #1305 from mtmail/travis-ci-ubuntu-16 Travis CI Ubuntu 14 => Ubuntu 16 --- diff --git a/.travis.yml b/.travis.yml index b9adc069..fe4e0cbd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- sudo: required -dist: trusty +dist: xenial language: python python: - "3.6" diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh index 6e648a1c..883a9472 100755 --- a/vagrant/install-on-travis-ci.sh +++ b/vagrant/install-on-travis-ci.sh @@ -1,8 +1,8 @@ #!/bin/bash # This script runs in a travis-ci.org virtual machine -# https://docs.travis-ci.com/user/trusty-ci-environment/ -# Ubuntu 14 (trusty) +# https://docs.travis-ci.com/user/reference/xenial/ +# Ubuntu 16 (xenial) # user 'travis' # $TRAVIS_BUILD_DIR is /home/travis/build/openstreetmap/Nominatim/, for others see # https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables @@ -14,11 +14,11 @@ sudo apt-get update -qq sudo apt-get install -y -qq libboost-dev libboost-system-dev \ libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\ - libbz2-dev libpq-dev libgeos-c1 libgeos++-dev libproj-dev \ - postgresql-server-dev-9.6 postgresql-9.6-postgis-2.3 postgresql-contrib-9.6 \ - apache2 php5 php5-pgsql php5-intl php-pear + libbz2-dev libpq-dev libproj-dev \ + postgresql-server-dev-9.6 postgresql-9.6-postgis-2.4 postgresql-contrib-9.6 \ + apache2 php php-pgsql php-intl php-pear -sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 php5-cgi +sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 php-cgi pip3 install --quiet behave nose pytidylib psycopg2-binary