Merge pull request #1732 from lonvia/improve-geocodejson-output

[nominatim.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1184d283ceeb8dd73adadf589a4d650509ec18e7..0ee3859249b9085f6cc54f8576e79f604e07e40b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,39 @@
 ---
 sudo: required
 ---
 sudo: required

-dist: trusty
+dist: xenial

 language: python
 python:
   - "3.6"
 addons:
   postgresql: "9.6"
 language: python
 python:
   - "3.6"
 addons:
   postgresql: "9.6"

+  apt:
+    packages:
+      postgresql-server-dev-9.6
+      postgresql-client-9.6

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

+before_install:
+  - phpenv global 7.1

 install:
   - vagrant/install-on-travis-ci.sh
 before_script:
   - psql -U postgres -c "create extension postgis"
 script:
 install:
   - vagrant/install-on-travis-ci.sh
 before_script:
   - psql -U postgres -c "create extension postgis"
 script:

-  - cd $TRAVIS_BUILD_DIR/build
-  - if [[ $TEST_SUITE == "monaco" ]]; then wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf; fi
-  - 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
-  - cd $TRAVIS_BUILD_DIR/test/php
-  - if [[ $TEST_SUITE == "tests" ]]; then phpunit ./ ; fi
+  - cd $TRAVIS_BUILD_DIR/

   - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi
   - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi

+  - cd $TRAVIS_BUILD_DIR/test/php
+  - if [[ $TEST_SUITE == "tests" ]]; then /usr/bin/phpunit ./ ; fi

   - cd $TRAVIS_BUILD_DIR/test/bdd
   - # behave --format=progress3 api
   - cd $TRAVIS_BUILD_DIR/test/bdd
   - # behave --format=progress3 api

-  - if [[ $TEST_SUITE == "tests" ]]; then behave --format=progress3 db ; fi
+  - if [[ $TEST_SUITE == "tests" ]]; then behave -DREMOVE_TEMPLATE=1 --format=progress3 db ; fi

   - if [[ $TEST_SUITE == "tests" ]]; then behave --format=progress3 osm2pgsql ; fi
   - if [[ $TEST_SUITE == "tests" ]]; then behave --format=progress3 osm2pgsql ; fi

+  - cd $TRAVIS_BUILD_DIR/build
+  - if [[ $TEST_SUITE == "monaco" ]]; then wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf; fi
+  - 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

 notifications:
   email: false
 notifications:
   email: false