From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 1 Jul 2020 16:11:50 +0000 (+0200)
Subject: Merge pull request #1829 from krahulreddy/websiteSetup
X-Git-Tag: v3.6.0~118
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/354487d7f475c0aecec484d077359f7ea44d4033?ds=sidebyside;hp=-c

Merge pull request #1829 from krahulreddy/websiteSetup

Added setup-website option
---

354487d7f475c0aecec484d077359f7ea44d4033
diff --combined .travis.yml
index 08aa9eb4,578bdd61..4461add9
--- a/.travis.yml
+++ b/.travis.yml
@@@ -26,6 -26,8 +26,8 @@@ script
    - 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/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,7 -37,5 +37,7 @@@
    - 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