From ed60154552f97bc972874311fdc76616fe545b2c Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 10 Feb 2021 16:02:14 +0100
Subject: [PATCH] actions: test import with installed version of Nominatim

---
 .github/actions/build-nominatim/action.yml | 21 +++++++-------
 .github/workflows/ci-tests.yml             | 33 +++++++++++-----------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 3cd826af..f65bd3ea 100644
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -9,17 +9,6 @@ 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
 
-        - name: Configure
-          run: mkdir build && cd build && cmake ..
-          shell: bash
-
-        - name: Build
-          run: |
-              make -j2 all
-              ./nominatim refresh --website
-          shell: bash
-          working-directory: build
-
         - name: Download dependencies
           run: |
               if [ ! -f data/country_osm_grid.sql.gz ]; then
@@ -27,3 +16,13 @@ runs:
               fi
           shell: bash
 
+        - name: Configure
+          run: mkdir build && cd build && cmake ..
+          shell: bash
+
+        - name: Build
+          run: |
+              make -j2 all
+              sudo make install
+          shell: bash
+          working-directory: build
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 1fa7e19d..d5336d4e 100644
--- 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
 
-            - name: Download import data
-              run: |
-                  if [ ! -f monaco-latest.osm.pbf ]; then
-                      wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
-                  fi
-              shell: bash
-
-            - name: Import
+            - name: Prepare import environment
               run: |
                   mkdir data-env
                   cd data-env
-                  ../build/nominatim import --osm-file ../monaco-latest.osm.pbf
+                  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
+              run: nominatim import --osm-file monaco-latest.osm.pbf
+              shell: bash
+              working-directory: data-env
+
             - 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
-              run: ../build/nominatim check-database
+              run: nominatim check-database
               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
-              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
+              env:
+                  NOMINATIM_DATABASE_DSN: pgsql:dbname=reverse