Upgrade Travis-CI from Ubuntu 18 to 20

This commit is contained in:
marc tobias
2020-09-14 00:28:53 +02:00
parent 9d506a4afa
commit 1d2f4264a2
2 changed files with 19 additions and 18 deletions

View File

@@ -1,22 +1,19 @@
--- ---
os: linux os: linux
dist: bionic dist: focal
language: python
python:
- "3.6"
addons: addons:
postgresql: "9.6" postgresql: "12"
apt: apt:
packages: packages:
postgresql-server-dev-9.6 - postgresql-server-dev-12
postgresql-client-9.6 - postgresql-12-postgis-3
git: git:
depth: 3 depth: 3
env: env:
- TEST_SUITE=tests - TEST_SUITE=tests
- TEST_SUITE=monaco - TEST_SUITE=monaco
before_install: before_install:
- phpenv global 7.1 - phpenv global 7.4
install: install:
- vagrant/install-on-travis-ci.sh - vagrant/install-on-travis-ci.sh
before_script: before_script:

View File

@@ -1,26 +1,30 @@
#!/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/reference/xenial/ # https://docs.travis-ci.com/user/reference/focal/
# Ubuntu 16 (xenial) # Ubuntu 20 (focal)
# 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
# Postgres 9.6 installed and started. role 'travis' already superuser # Postgres 12 installed and started. role 'travis' already superuser
# Python 3.6 # Python 3.8
# Travis has a 4 MB, 10000 line output limit, so where possible we run script --quiet # Travis has a 4 MB, 10000 line output limit, so where possible we run script --quiet
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y -qq libboost-dev libboost-system-dev \
libboost-filesystem-dev libexpat1-dev zlib1g-dev\ sudo apt-get install -y -qq build-essential cmake g++ libboost-dev libboost-system-dev \
libboost-filesystem-dev libexpat1-dev zlib1g-dev \
libbz2-dev libpq-dev libproj-dev \ libbz2-dev libpq-dev libproj-dev \
postgresql-server-dev-9.6 postgresql-9.6-postgis-2.4 postgresql-contrib-9.6 \ postgresql-server-dev-12 postgresql-12-postgis-3 \
apache2 php php-pgsql php-intl postgresql-contrib postgresql-12-postgis-3-scripts \
apache2 php php-pgsql libapache2-mod-php \
php-intl python3-setuptools python3-dev python3-pip \
python3-psycopg2 python3-tidylib git
sudo apt-get install -y -qq python3-dev python3-pip php-cgi sudo apt-get install -y -qq php-cgi
pip3 install --quiet behave nose pytidylib psycopg2-binary osmium pip3 install --quiet behave nose osmium
# https://github.com/squizlabs/PHP_CodeSniffer # https://github.com/squizlabs/PHP_CodeSniffer
composer global require "squizlabs/php_codesniffer=*" composer global require "squizlabs/php_codesniffer=*"