actions: test import with installed version of Nominatim

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 3cd826afea660007359ab8add33132e2ba554389..f65bd3ea51bab6dc0d2eeeb8f40b0b539eb99841 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -9,6 +9,13 @@ runs:
             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 python3-dotenv
           shell: bash
 
             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 python3-dotenv
           shell: bash
 

+        - name: Download dependencies
+          run: |
+              if [ ! -f data/country_osm_grid.sql.gz ]; then
+                  wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
+              fi
+          shell: bash
+

         - name: Configure
           run: mkdir build && cd build && cmake ..
           shell: bash
         - name: Configure
           run: mkdir build && cd build && cmake ..
           shell: bash


@@ -16,14 +23,6 @@ runs:
         - name: Build
           run: |
               make -j2 all
         - name: Build
           run: |
               make -j2 all

-              ./nominatim refresh --website
+              sudo make install

           shell: bash
           working-directory: build
           shell: bash
           working-directory: build

-
-        - name: Download dependencies
-          run: |
-              if [ ! -f data/country_osm_grid.sql.gz ]; then
-                  wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
-              fi
-          shell: bash
-

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 1fa7e19d19674f6e35f6d7da68271f0b2109d037..d5336d4ef52e5cb3fbb6a3fc02ef8dad22ec221e 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -92,36 +92,37 @@ jobs:
                   postgis-version: 3
             - uses: ./.github/actions/build-nominatim
 
                   postgis-version: 3
             - uses: ./.github/actions/build-nominatim
 

-            - name: Download import data
+            - name: Prepare import environment

               run: |
               run: |

+                  mkdir data-env
+                  cd data-env

                   if [ ! -f monaco-latest.osm.pbf ]; then
                       wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
                   fi
                   if [ ! -f monaco-latest.osm.pbf ]; then
                       wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
                   fi

+                  which nominatim

               shell: bash
 
             - name: Import
               shell: bash
 
             - name: Import

-              run: |
-                  mkdir data-env
-                  cd data-env
-                  ../build/nominatim import --osm-file ../monaco-latest.osm.pbf
+              run: nominatim import --osm-file monaco-latest.osm.pbf

               shell: bash
               shell: bash

+              working-directory: data-env

 
             - name: Import special phrases
 
             - name: Import special phrases

-              run: ../build/nominatim special-phrases --from-wiki | psql -d nominatim
+              run: nominatim special-phrases --from-wiki | psql -d nominatim

               working-directory: data-env
 
             - name: Check import
               working-directory: data-env
 
             - name: Check import

-              run: ../build/nominatim check-database
+              run: nominatim check-database

               working-directory: data-env
 
             - name: Run update
               run: |
               working-directory: data-env
 
             - name: Run update
               run: |

-                   ../build/nominatim replication --init
-                   ../build/nominatim replication --once
+                   nominatim replication --init
+                   nominatim replication --once

               working-directory: data-env
 
             - name: Run reverse-only import
               working-directory: data-env
 
             - name: Run reverse-only import

-              run : |
-                  echo 'NOMINATIM_DATABASE_DSN="pgsql:dbname=reverse"' > .env
-                  ../build/nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only
+              run : nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only

               working-directory: data-env
               working-directory: data-env

+              env:
+                  NOMINATIM_DATABASE_DSN: pgsql:dbname=reverse