phpcs instructions only searched one level deep

[nominatim.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index dffa68eb07815196e58eebe48f43b3d16b3b20ec..c67f155e4240a1b5e2a0e0e08d0b1937143f36c7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,31 @@
 ---
 ---

-language:
-  - 'python'

 sudo: required
 dist: trusty
 sudo: required
 dist: trusty

-before_install:
-  - git submodule update --init --recursive
+language: python
+python:
+  - "3.6"
+addons:
+  postgresql: "9.6"
+git:
+  depth: 3
+env:
+  - TEST_SUITE=tests
+  - TEST_SUITE=monaco

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

-  - cd $TRAVIS_BUILD_DIR/build
-  - wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
-  - ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | grep -v 'ETA (seconds)'
-  - ./utils/specialphrases.php --countries > ../data/specialphrases_countries.sql
-  - psql -d nominatim -f ../data/specialphrases_countries.sql
+  - psql -U postgres -c "create extension postgis"

 script:
 script:

-  - cd $TRAVIS_BUILD_DIR/tests-php
-  - phpunit ./
-  - cd $TRAVIS_BUILD_DIR/tests
-  - lettuce --verbosity=2 features/api
-  - lettuce --verbosity=2 features/db
-  - lettuce --verbosity=2 features/osm2pgsql
+  - 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 ./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 ./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
+  - if [[ $TEST_SUITE == "tests" ]]; then phpcs --report-width=120 . ; fi
+  - 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 --format=progress3 osm2pgsql ; fi
+notifications:
+  email: false