use cli tool for github CI

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 555d7ee24dde791f961167e266371332bef6f9c2..e6aec814b5be2246b31eded213165718132bfe77 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -6,7 +6,7 @@ runs:
     steps:
         - name: Install prerequisits
           run: |
     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
           shell: bash
 
         - name: Configure

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 4b019bce04a3152cd4ae8300d01a8fc9736cda93..d462a8bb6bd087433af14a8a98b198500941945d 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -101,25 +101,25 @@ jobs:
               shell: bash
 
             - name: Import
               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
               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
               working-directory: build
 
             - name: Check import

-              run: php ./utils/check_import_finished.php
+              run: ./nominatim check-database

               working-directory: build
 
             - name: Run update
               run: |
               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
               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
               working-directory: build