be less strict on filtering one-letter queries

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index c6792f3ae6c4196ef597a628c4c5d335d7b36edd..8b38d3dc77e7ca553d12c22a919dcd33f9a13b5b 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -3,204 +3,343 @@ name: CI Tests
 on: [ push, pull_request ]
 
 jobs:
 on: [ push, pull_request ]
 
 jobs:

-    tests:
-        strategy:
-            matrix:
-                ubuntu: [18, 20]
-                include:
-                    - ubuntu: 18
-                      postgresql: 9.5
-                      postgis: 2.5
-                      pytest: pytest
-                    - ubuntu: 20
-                      postgresql: 13
-                      postgis: 3
-                      pytest: py.test-3
-
-        runs-on: ubuntu-${{ matrix.ubuntu }}.04
+    create-archive:
+        runs-on: ubuntu-latest

 
         steps:
 
         steps:

-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v4

               with:
               with:

-                  submodules: true
-                  path: Nominatim
+                submodules: true

 
 

-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
+            - uses: actions/cache@v4

               with:
               with:

-                  php-version: '7.4'
-                  tools: phpunit, phpcs, composer
+                  path: |
+                     data/country_osm_grid.sql.gz
+                  key: nominatim-country-data-1
+
+            - name: Package tarball
+              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
+                  cd ..
+                  tar czf nominatim-src.tar.bz2 Nominatim
+                  mv nominatim-src.tar.bz2 Nominatim

 
 

-            - uses: actions/setup-python@v2
+            - name: 'Upload Artifact'
+              uses: actions/upload-artifact@v4

               with:
               with:

-                python-version: 3.6
-              if: matrix.ubuntu == 18
+                  name: full-source
+                  path: nominatim-src.tar.bz2
+                  retention-days: 1

 
 

-            - name: Get Date
-              id: get-date
-              run: |
-                  echo "::set-output name=date::$(/bin/date -u "+%Y%W")"
-              shell: bash
+    tests:
+        needs: create-archive
+        strategy:
+            matrix:
+                flavour: ["ubuntu-20", "ubuntu-24"]
+                include:
+                    - flavour: ubuntu-20
+                      ubuntu: 20
+                      postgresql: 12
+                      lua: '5.1'
+                      dependencies: pip
+                    - flavour: ubuntu-24
+                      ubuntu: 24
+                      postgresql: 17
+                      lua: '5.3'
+                      dependencies: apt

 
 

-            - uses: actions/cache@v2
+        runs-on: ubuntu-${{ matrix.ubuntu }}.04
+
+        steps:
+            - uses: actions/download-artifact@v4

               with:
               with:

-                  path: |
-                     country_grid.sql.gz
-                  key: nominatim-country-data-${{ steps.get-date.outputs.date }}
+                  name: full-source
+
+            - name: Unpack Nominatim
+              run: tar xf nominatim-src.tar.bz2

 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:
                   postgresql-version: ${{ matrix.postgresql }}
 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:
                   postgresql-version: ${{ matrix.postgresql }}

-                  postgis-version: ${{ matrix.postgis }}

 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:
 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:

-                  ubuntu: ${{ matrix.ubuntu }}
-
-            - name: Install test prerequsites
-              run: sudo apt-get install -y -qq php-codesniffer pylint python3-pytest python3-behave python3-pytest-cov php-codecoverage php-xdebug
-              if: matrix.ubuntu == 20
+                  dependencies: ${{ matrix.dependencies }}

 
 

-            - name: Install test prerequsites
+            - name: Compile osm2pgsql

               run: |
               run: |

-                   sudo apt-get install -y -qq php-codesniffer php-codecoverage php-xdebug
-                   pip3 install pylint==2.6.0 pytest pytest-cov behave==1.2.6
-              if: matrix.ubuntu == 18
+                  sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua-dkjson nlohmann-json3-dev 
+                  mkdir osm2pgsql-build
+                  cd osm2pgsql-build
+                  git clone https://github.com/osm2pgsql-dev/osm2pgsql
+                  mkdir build
+                  cd build
+                  cmake ../osm2pgsql
+                  make
+                  sudo make install
+                  cd ../..
+                  rm -rf osm2pgsql-build
+              if: matrix.ubuntu == '20'
+              env:
+                  LUA_VERSION: ${{ matrix.lua }}

 
 

-            - name: PHP linting
-              run: phpcs --report-width=120 .
-              working-directory: Nominatim
+            - name: Install test prerequisites
+              run: ./venv/bin/pip install behave==1.2.6
+
+            - name: Install test prerequisites (apt)
+              run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn python3-falcon python3-aiosqlite python3-pyosmium
+              if: matrix.dependencies == 'apt'
+
+            - name: Install test prerequisites (pip)
+              run: ./venv/bin/pip install pytest-asyncio falcon starlette asgi_lifespan aiosqlite osmium uvicorn
+              if: matrix.dependencies == 'pip'
+
+            - name: Install latest flake8
+              run: ./venv/bin/pip install -U flake8

 
             - name: Python linting
 
             - name: Python linting

-              run: pylint nominatim
+              run: ../venv/bin/python -m flake8 src

               working-directory: Nominatim
 
               working-directory: Nominatim
 

-            - name: PHP unit tests
-              run: phpunit --coverage-clover ../../coverage-php.xml ./
-              working-directory: Nominatim/test/php
+            - name: Install mypy and typechecking info
+              run: ./venv/bin/pip install -U mypy types-PyYAML types-jinja2 types-psutil types-requests types-ujson types-Pygments typing-extensions
+              if: matrix.dependencies == 'pip'
+
+            - name: Python static typechecking
+              run: ../venv/bin/python -m mypy --strict --python-version 3.8 src
+              working-directory: Nominatim
+              if: matrix.dependencies == 'pip'

 
             - name: Python unit tests
 
             - name: Python unit tests

-              run: $PYTEST --cov=nominatim --cov-report=xml test/python
+              run: ../venv/bin/python -m pytest test/python

               working-directory: Nominatim
               working-directory: Nominatim

-              env:
-                PYTEST: ${{ matrix.pytest }}

 
             - name: BDD tests
               run: |
 
             - name: BDD tests
               run: |

-                  mkdir cov
-                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 -DPHPCOV=./cov
-                  composer require phpunit/phpcov:7.0.2
-                  vendor/bin/phpcov merge --clover ../../coverage-bdd.xml ./cov
+                  ../../../venv/bin/python -m behave -DREMOVE_TEMPLATE=1 --format=progress3

               working-directory: Nominatim/test/bdd
 
               working-directory: Nominatim/test/bdd
 

-            - name: BDD tests (legacy_icu tokenizer)
-              run: |
-                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy_icu --format=progress3
-              working-directory: Nominatim/test/bdd
+    install:
+        runs-on: ubuntu-latest
+        needs: create-archive

 
 

-            - name: Upload coverage to Codecov
-              uses: codecov/codecov-action@v1
-              with:
-                files: ./Nominatim/coverage*.xml
-                directory: ./
-                name: codecov-umbrella
-                fail_ci_if_error: false
-                path_to_write_report: ./coverage/codecov_report.txt
-                verbose: true
-
-    import:

         strategy:
             matrix:
         strategy:
             matrix:

-                ubuntu: [18, 20]
+                name: [Ubuntu-22, Ubuntu-24]

                 include:
                 include:

-                    - ubuntu: 18
-                      postgresql: 9.5
-                      postgis: 2.5
-                    - ubuntu: 20
-                      postgresql: 13
-                      postgis: 3
-
-        runs-on: ubuntu-${{ matrix.ubuntu }}.04
+                    - name: Ubuntu-22
+                      image: "ubuntu:22.04"
+                      ubuntu: 22
+                      install_mode: install-apache
+                    - name: Ubuntu-24
+                      image: "ubuntu:24.04"
+                      ubuntu: 24
+                      install_mode: install-apache
+
+        container:
+            image: ${{ matrix.image }}
+            env:
+                LANG: en_US.UTF-8
+
+        defaults:
+            run:
+                shell: sudo -Hu nominatim bash --noprofile --norc -eo pipefail {0}

 
         steps:
 
         steps:

-            - uses: actions/checkout@v2
-              with:
-                  submodules: true
-                  path: Nominatim
+            - name: Prepare container (Ubuntu)
+              run: |
+                  export APT_LISTCHANGES_FRONTEND=none
+                  export DEBIAN_FRONTEND=noninteractive
+                  apt-get update -qq
+                  apt-get install -y git sudo wget
+                  ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
+              shell: bash

 
 

-            - name: Get Date
-              id: get-date
+            - name: Setup import user

               run: |
               run: |

-                  echo "::set-output name=date::$(/bin/date -u "+%Y%W")"
+                  useradd -m 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
               shell: bash

+              env:
+                OS: ${{ matrix.name }}
+                INSTALL_MODE: ${{ matrix.install_mode }}

 
 

-            - uses: actions/cache@v2
+            - uses: actions/download-artifact@v4

               with:
               with:

-                  path: |
-                     country_grid.sql.gz
-                  key: nominatim-country-data-${{ steps.get-date.outputs.date }}
+                  name: full-source
+                  path: /home/nominatim

 
 

-            - uses: actions/cache@v2
-              with:
-                  path: |
-                     monaco-latest.osm.pbf
-                  key: nominatim-test-data-${{ steps.get-date.outputs.date }}
+            - name: Install Nominatim
+              run: |
+                export USERNAME=nominatim
+                export USERHOME=/home/nominatim
+                export NOSYSTEMD=yes
+                export HAVE_SELINUX=no
+                tar xf nominatim-src.tar.bz2
+                . vagrant.sh
+              working-directory: /home/nominatim

 
 

-            - uses: actions/setup-python@v2
-              with:
-                python-version: 3.6
-              if: matrix.ubuntu == 18
+            - 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
+
+            - name: Add nominatim to path
+              run: |
+                sudo ln -s /home/nominatim/nominatim-venv/bin/nominatim /usr/local/bin/nominatim

 
 

-            - uses: ./Nominatim/.github/actions/setup-postgresql
-              with:
-                  postgresql-version: ${{ matrix.postgresql }}
-                  postgis-version: ${{ matrix.postgis }}
-            - uses: ./Nominatim/.github/actions/build-nominatim
-              with:
-                  ubuntu: ${{ matrix.ubuntu }}
+            - name: Need lua binary
+              run: |
+                sudo apt-get install -y lua5.4 lua-dkjson

 
 

-            - name: Clean installation
-              run: rm -rf Nominatim build
-              shell: bash
+            - name: Print version
+              run: nominatim --version
+              working-directory: /home/nominatim/nominatim-project

 
 

-            - name: Prepare import environment
-              run: |
-                  if [ ! -f monaco-latest.osm.pbf ]; then
-                      wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
-                  fi
-                  mkdir data-env
-                  cd data-env
-              shell: bash
+            - name: Print taginfo
+              run: lua taginfo.lua
+              working-directory: /home/nominatim
+
+            - name: Collect host OS information
+              run: nominatim admin --collect-os-info
+              working-directory: /home/nominatim/nominatim-project

 
             - name: Import
 
             - name: Import

-              run: nominatim import --osm-file ../monaco-latest.osm.pbf
-              shell: bash
-              working-directory: data-env
+              run: nominatim import --osm-file ../test.pbf
+              working-directory: /home/nominatim/nominatim-project

 
             - name: Import special phrases
               run: nominatim special-phrases --import-from-wiki
 
             - name: Import special phrases
               run: nominatim special-phrases --import-from-wiki

-              working-directory: data-env
+              working-directory: /home/nominatim/nominatim-project

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

-              working-directory: data-env
+              working-directory: /home/nominatim/nominatim-project

 
             - name: Warm up database
               run: nominatim admin --warm
 
             - name: Warm up database
               run: nominatim admin --warm

-              working-directory: data-env
+              working-directory: /home/nominatim/nominatim-project
+
+            - name: Install osmium
+              run: |
+                  /home/nominatim/nominatim-venv/bin/pip install osmium

 
             - name: Run update
               run: |
 
             - name: Run update
               run: |

-                   nominatim replication --init
-                   nominatim replication --once
-              working-directory: data-env
+                  nominatim replication --init
+                  NOMINATIM_REPLICATION_MAX_DIFF=1 nominatim replication --once
+              working-directory: /home/nominatim/nominatim-project
+
+            - name: Clean up database
+              run: nominatim refresh --postcodes --word-tokens
+              working-directory: /home/nominatim/nominatim-project

 
             - name: Run reverse-only import
 
             - name: Run reverse-only import

-              run : nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only --no-updates
-              working-directory: data-env
-              env:
-                  NOMINATIM_DATABASE_DSN: pgsql:dbname=reverse
+              run : |
+                  echo 'NOMINATIM_DATABASE_DSN="pgsql:dbname=reverse"' >> .env
+                  nominatim import --osm-file ../test.pbf --reverse-only --no-updates
+              working-directory: /home/nominatim/data-env-reverse

 
 

-            - name: Check reverse import
+            - name: Check reverse-only import

               run: nominatim admin --check-database
               run: nominatim admin --check-database

-              working-directory: data-env
+              working-directory: /home/nominatim/data-env-reverse
+
+            - name: Clean up database (reverse-only import)
+              run: nominatim refresh --postcodes --word-tokens
+              working-directory: /home/nominatim/nominatim-project
+
+    install-no-superuser:
+      runs-on: ubuntu-24.04
+      needs: create-archive
+
+      steps:
+          - uses: actions/download-artifact@v4
+            with:
+                name: full-source
+
+          - name: Unpack Nominatim
+            run: tar xf nominatim-src.tar.bz2
+
+          - uses: ./Nominatim/.github/actions/setup-postgresql
+            with:
+                postgresql-version: 16
+
+          - uses: ./Nominatim/.github/actions/build-nominatim
+
+          - name: Prepare import environment
+            run: |
+                mv Nominatim/test/testdb/apidb-test-data.pbf test.pbf
+                rm -rf Nominatim
+
+          - name: Prepare Database
+            run: |
+                ./venv/bin/nominatim import --prepare-database
+
+          - name: Create import user
+            run: |
+                sudo -u postgres createuser osm-import
+                psql -d nominatim -c "ALTER USER \"osm-import\" WITH PASSWORD 'osm-import'"
+                psql -d nominatim -c 'GRANT CREATE ON SCHEMA public TO "osm-import"'
+
+          - name: Run import
+            run: |
+                NOMINATIM_DATABASE_DSN="pgsql:host=127.0.0.1;dbname=nominatim;user=osm-import;password=osm-import" ./venv/bin/nominatim import --continue import-from-file --osm-file test.pbf
+
+          - name: Check full import
+            run: ./venv/bin/nominatim admin --check-database
+
+    migrate:
+      runs-on: ubuntu-24.04
+      needs: create-archive
+
+      steps:
+          - uses: actions/download-artifact@v4
+            with:
+                name: full-source
+
+          - name: Unpack Nominatim
+            run: tar xf nominatim-src.tar.bz2
+
+          - uses: ./Nominatim/.github/actions/setup-postgresql
+            with:
+                postgresql-version: 17
+
+          - name: Install Python dependencies
+            run: |
+              sudo apt-get install --no-install-recommends virtualenv osm2pgsql
+
+          - name: Install Nominatim master version
+            run: |
+              virtualenv master
+              cd Nominatim
+              ../master/bin/pip install packaging/nominatim-db
+
+          - name: Install Nominatim from pypi
+            run: |
+              virtualenv release
+              ./release/bin/pip install nominatim-db
+
+          - name: Import Nominatim database using release
+            run: |
+              ./release/bin/nominatim import --osm-file Nominatim/test/testdb/apidb-test-data.pbf
+              ./release/bin/nominatim add-data --file Nominatim/test/testdb/additional_api_test.data.osm
+
+          - name: Migrate to master version
+            run: |
+              ./master/bin/nominatim admin --migrate
+              ./release/bin/nominatim add-data --file Nominatim/test/testdb/additional_api_test.data.osm
+
+    codespell:
+      runs-on: ubuntu-latest
+      steps:
+          - uses: codespell-project/actions-codespell@v2
+            with:
+                only_warn: 1