Upgrade Travis-CI from Ubuntu 18 to 20

diff --git a/.travis.yml b/.travis.yml
index 4461add9f454f8150f5ea5ffebdb5e937d3405eb..8370fb59cad7fe339efcf2428ea22d94b70c52ab 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,19 @@
 ---
 os: linux
 ---
 os: linux

-dist: bionic
-language: python
-python:
-  - "3.6"
+dist: focal

 addons:
 addons:

-  postgresql: "9.6"
+  postgresql: "12"

   apt:
     packages:
   apt:
     packages:

-      postgresql-server-dev-9.6
-      postgresql-client-9.6
+      - postgresql-server-dev-12
+      - postgresql-12-postgis-3

 git:
   depth: 3
 env:
   - TEST_SUITE=tests
   - TEST_SUITE=monaco
 before_install:
 git:
   depth: 3
 env:
   - TEST_SUITE=tests
   - TEST_SUITE=monaco
 before_install:

-  - phpenv global 7.1
+  - phpenv global 7.4

 install:
   - vagrant/install-on-travis-ci.sh
 before_script:
 install:
   - vagrant/install-on-travis-ci.sh
 before_script:

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index 3b8ed190460d63d781e4ef5cc3f7915dbbaac8fc..66d3c7947324ce00c3ec1d961bdb705c6655e00b 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -1,26 +1,30 @@
 #!/bin/bash
 
 # This script runs in a travis-ci.org virtual machine
 #!/bin/bash
 
 # This script runs in a travis-ci.org virtual machine

-# https://docs.travis-ci.com/user/reference/xenial/
-# Ubuntu 16 (xenial)
+# https://docs.travis-ci.com/user/reference/focal/
+# Ubuntu 20 (focal)

 # 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
 # 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

-# Postgres 9.6 installed and started. role 'travis' already superuser
-# Python 3.6
+# Postgres 12 installed and started. role 'travis' already superuser
+# Python 3.8

 # Travis has a 4 MB, 10000 line output limit, so where possible we run script --quiet
 
 
 sudo apt-get update -qq
 # Travis has a 4 MB, 10000 line output limit, so where possible we run script --quiet
 
 
 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 \
-                            apache2 php php-pgsql php-intl
+                            postgresql-server-dev-12 postgresql-12-postgis-3 \
+                            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
 composer global require "squizlabs/php_codesniffer=*"
 
 # https://github.com/squizlabs/PHP_CodeSniffer
 composer global require "squizlabs/php_codesniffer=*"