Merge pull request #1305 from mtmail/travis-ci-ubuntu-16

Travis CI Ubuntu 14 => Ubuntu 16
This commit is contained in:
Sarah Hoffmann
2019-02-10 17:20:06 +01:00
committed by GitHub
2 changed files with 7 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
--- ---
sudo: required sudo: required
dist: trusty dist: xenial
language: python language: python
python: python:
- "3.6" - "3.6"

View File

@@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# This script runs in a travis-ci.org virtual machine # This script runs in a travis-ci.org virtual machine
# https://docs.travis-ci.com/user/trusty-ci-environment/ # https://docs.travis-ci.com/user/reference/xenial/
# Ubuntu 14 (trusty) # Ubuntu 16 (xenial)
# user 'travis' # user 'travis'
# $TRAVIS_BUILD_DIR is /home/travis/build/openstreetmap/Nominatim/, for others see # $TRAVIS_BUILD_DIR is /home/travis/build/openstreetmap/Nominatim/, for others see
# https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables # https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
@@ -14,11 +14,11 @@
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y -qq libboost-dev libboost-system-dev \ sudo apt-get install -y -qq libboost-dev libboost-system-dev \
libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\ libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
libbz2-dev libpq-dev libgeos-c1 libgeos++-dev libproj-dev \ libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-9.6 postgresql-9.6-postgis-2.3 postgresql-contrib-9.6 \ postgresql-server-dev-9.6 postgresql-9.6-postgis-2.4 postgresql-contrib-9.6 \
apache2 php5 php5-pgsql php5-intl php-pear 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 pip3 install --quiet behave nose pytidylib psycopg2-binary