X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/38c21de0ee17bb0eacd6cc8f0e1ed71cbee0b0c9..f8a5f2964fb4fdcaa774f1149dc6007012af3a2a:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index dd973aec..b16d8106 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,30 @@
 ---
 os: linux
-dist: xenial
-language: python
-python:
-  - "3.6"
+dist: focal
 addons:
-  postgresql: "9.6"
+  postgresql: "12"
   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:
-  - phpenv global 7.1
+  - phpenv global 7.4
 install:
-  - vagrant/install-on-travis-ci.sh
+  - vagrant/Install-on-Travis-CI.sh
 before_script:
   - psql -U postgres -c "create extension postgis"
 script:
   - cd $TRAVIS_BUILD_DIR/
   - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi
   - cd $TRAVIS_BUILD_DIR/test/php
-  - if [[ $TEST_SUITE == "tests" ]]; then UNIT_TEST_DSN='pgsql:dbname=nominatim_unit_tests' /usr/bin/phpunit ./ ; fi
+  - if [[ $TEST_SUITE == "tests" ]]; then /usr/bin/phpunit ./ ; fi
+  - cd $TRAVIS_BUILD_DIR/build
+  - /usr/bin/env php ./utils/setup.php --setup-website
   - cd $TRAVIS_BUILD_DIR/test/bdd
   - # behave --format=progress3 api
   - if [[ $TEST_SUITE == "tests" ]]; then behave -DREMOVE_TEMPLATE=1 --format=progress3 db ; fi
@@ -35,5 +34,7 @@ script:
   - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | grep -v 'ETA (seconds)'; fi
   - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/specialphrases.php --wiki-import | psql -d test_api_nominatim >/dev/null; fi
   - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/check_import_finished.php; fi
+  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/update.php --init-updates; fi
+  - if [[ $TEST_SUITE == "monaco" ]]; then /usr/bin/env php ./utils/update.php --import-osmosis; fi
 notifications:
   email: false