Merge remote-tracking branch 'upstream/master'

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 8b38d3dc77e7ca553d12c22a919dcd33f9a13b5b..f1d9f028c5cedd172bb783d48d05516dee66677b 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -37,10 +37,10 @@ jobs:
         needs: create-archive
         strategy:
             matrix:
         needs: create-archive
         strategy:
             matrix:

-                flavour: ["ubuntu-20", "ubuntu-24"]
+                flavour: ["ubuntu-22", "ubuntu-24"]

                 include:
                 include:

-                    - flavour: ubuntu-20
-                      ubuntu: 20
+                    - flavour: ubuntu-22
+                      ubuntu: 22

                       postgresql: 12
                       lua: '5.1'
                       dependencies: pip
                       postgresql: 12
                       lua: '5.1'
                       dependencies: pip


@@ -81,7 +81,7 @@ jobs:
                   sudo make install
                   cd ../..
                   rm -rf osm2pgsql-build
                   sudo make install
                   cd ../..
                   rm -rf osm2pgsql-build

-              if: matrix.ubuntu == '20'
+              if: matrix.ubuntu == '22'

               env:
                   LUA_VERSION: ${{ matrix.lua }}
 
               env:
                   LUA_VERSION: ${{ matrix.lua }}
 


@@ -185,9 +185,6 @@ jobs:
             - name: Prepare import environment
               run: |
                   mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf
             - name: Prepare import environment
               run: |
                   mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf

-                  mv Nominatim/settings/flex-base.lua flex-base.lua
-                  mv Nominatim/settings/import-extratags.lua import-extratags.lua
-                  mv Nominatim/settings/taginfo.lua taginfo.lua

                   rm -rf Nominatim
                   mkdir data-env-reverse
               working-directory: /home/nominatim
                   rm -rf Nominatim
                   mkdir data-env-reverse
               working-directory: /home/nominatim


@@ -205,7 +202,7 @@ jobs:
               working-directory: /home/nominatim/nominatim-project
 
             - name: Print taginfo
               working-directory: /home/nominatim/nominatim-project
 
             - name: Print taginfo

-              run: lua taginfo.lua
+              run: lua ./nominatim-venv/lib/*/site-packages/nominatim_db/resources/lib-lua/taginfo.lua

               working-directory: /home/nominatim
 
             - name: Collect host OS information
               working-directory: /home/nominatim
 
             - name: Collect host OS information