From 97710ee9d1f90d05f7c644302bb9d0a71ae0c761 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 14 Jan 2021 14:37:52 +0100 Subject: [PATCH] use cli tool for github CI --- .github/actions/build-nominatim/action.yml | 2 +- .github/workflows/ci-tests.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml index 555d7ee2..e6aec814 100644 --- a/.github/actions/build-nominatim/action.yml +++ b/.github/actions/build-nominatim/action.yml @@ -6,7 +6,7 @@ runs: steps: - name: Install prerequisits run: | - sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium php-symfony-dotenv + sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium php-symfony-dotenv python3-dotenv shell: bash - name: Configure diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4b019bce..d462a8bb 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -101,25 +101,25 @@ jobs: shell: bash - name: Import - run: php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --osm2pgsql-cache 500 --all + run: ./nominatim import --osm-file ../monaco-latest.osm.pbf working-directory: build - name: Import special phrases - run: php ./utils/specialphrases.php --wiki-import | psql -d nominatim + run: ./nominatim special-phrases --from-wiki | psql -d nominatim working-directory: build - name: Check import - run: php ./utils/check_import_finished.php + run: ./nominatim check-database working-directory: build - name: Run update run: | - php ./utils/update.php --init-updates - php ./utils/update.php --import-osmosis + ./nominatim replication --init + ./nominatim replication --once working-directory: build - name: Run reverse-only import run : | dropdb nominatim - php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --reverse-only --all + php ./nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only working-directory: build