simplify weigh_search() function

[nominatim.git] / .github / workflows / ci-tests.yml

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index ff4594edaa3bdf43cc85269484e45ccf32e9c88c..42c03edc17d9e76fd20463b6294c25ce1fa730bc 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -382,11 +382,10 @@ jobs:
                 ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
             shell: bash
 
                 ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
             shell: bash
 

-          - name: Setup database users
+          - name: Setup import user

             run: |
                 useradd -m nominatim
             run: |
                 useradd -m nominatim

-                useradd -m osm-import
-                echo 'nominatim   ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/nominatim
+                echo 'nominatim   ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/nominiatim

                 echo "/home/nominatim/Nominatim/vagrant/Install-on-${OS}.sh no $INSTALL_MODE" > /home/nominatim/vagrant.sh
             shell: bash
             env:
                 echo "/home/nominatim/Nominatim/vagrant/Install-on-${OS}.sh no $INSTALL_MODE" > /home/nominatim/vagrant.sh
             shell: bash
             env:


@@ -434,17 +433,11 @@ jobs:
                 sudo -u postgres psql -c "GRANT INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO \"osm-import\";"
             working-directory: /home/nominatim/nominatim-project
 
                 sudo -u postgres psql -c "GRANT INSERT, UPDATE ON ALL TABLES IN SCHEMA public TO \"osm-import\";"
             working-directory: /home/nominatim/nominatim-project
 

-          - name: Change nominatim directory ownership
-            run: |
-                sudo chown -R osm-import /home/nominatim/nominatim-project
-

           - name: Run import
             run: |
           - name: Run import
             run: |

-                NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim;user=osm-import;password=osm-import" nominatim import --continue import-from-file --osm-file ../test.pbf
+                NOMINATIM_DATABASE_DSN="pgsql:host=127.0.0.1;dbname=nominatim;user=osm-import;password=osm-import" nominatim import --continue import-from-file --osm-file ../test.pbf

             working-directory: /home/nominatim/nominatim-project
             working-directory: /home/nominatim/nominatim-project

-            shell: sudo -Hu osm-import bash --noprofile --norc -eo pipefail {0}

 
           - name: Check full import
             run: nominatim admin --check-database
 
           - name: Check full import
             run: nominatim admin --check-database

-            working-directory: /home/nominatim/nominatim-project
-            shell: sudo -Hu osm-import bash --noprofile --norc -eo pipefail {0}
\ No newline at end of file
+            working-directory: /home/nominatim/nominatim-project
\ No newline at end of file