split SearchResult type

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 5d70b56838eceb23b51abb5ef3c8207ffa3d070b..7dfb3f1d34b0b677940abf7695986fcd87070001 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -7,11 +7,11 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
         runs-on: ubuntu-latest
 
         steps:

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

               with:
                 submodules: true
 
               with:
                 submodules: true
 

-            - uses: actions/cache@v2
+            - uses: actions/cache@v3

               with:
                   path: |
                      data/country_osm_grid.sql.gz
               with:
                   path: |
                      data/country_osm_grid.sql.gz


@@ -27,7 +27,7 @@ jobs:
                   mv nominatim-src.tar.bz2 Nominatim
 
             - name: 'Upload Artifact'
                   mv nominatim-src.tar.bz2 Nominatim
 
             - name: 'Upload Artifact'

-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v3

               with:
                   name: full-source
                   path: nominatim-src.tar.bz2
               with:
                   name: full-source
                   path: nominatim-src.tar.bz2


@@ -37,28 +37,31 @@ jobs:
         needs: create-archive
         strategy:
             matrix:
         needs: create-archive
         strategy:
             matrix:

-                ubuntu: [18, 20, 22]
+                flavour: [oldstuff, "ubuntu-20", "ubuntu-22"]

                 include:
                 include:

-                    - ubuntu: 18
-                      postgresql: 9.6
-                      postgis: 2.5
-                      pytest: pytest
-                      php: 7.2
-                    - ubuntu: 20
+                    - flavour: oldstuff
+                      ubuntu: 20
+                      postgresql: '9.6'
+                      postgis: '2.5'
+                      php: '7.3'
+                      lua: '5.1'
+                    - flavour: ubuntu-20
+                      ubuntu: 20

                       postgresql: 13
                       postgis: 3
                       postgresql: 13
                       postgis: 3

-                      pytest: py.test-3
-                      php: 7.4
-                    - ubuntu: 22
-                      postgresql: 14
+                      php: '7.4'
+                      lua: '5.3'
+                    - flavour: ubuntu-22
+                      ubuntu: 22
+                      postgresql: 15

                       postgis: 3
                       postgis: 3

-                      pytest: py.test-3
-                      php: 8.1
+                      php: '8.1'
+                      lua: '5.3'

 
         runs-on: ubuntu-${{ matrix.ubuntu }}.04
 
         steps:
 
         runs-on: ubuntu-${{ matrix.ubuntu }}.04
 
         steps:

-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v3

               with:
                   name: full-source
 
               with:
                   name: full-source
 


@@ -69,13 +72,15 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}

-                  tools: phpunit, phpcs, composer
+                  tools: phpunit:9, phpcs, composer

                   ini-values: opcache.jit=disable
                   ini-values: opcache.jit=disable

+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

 
 

-            - uses: actions/setup-python@v2
+            - uses: actions/setup-python@v4

               with:
               with:

-                python-version: 3.6
-              if: matrix.ubuntu == 18
+                python-version: 3.7
+              if: matrix.flavour == 'oldstuff'

 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:
 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:


@@ -84,59 +89,71 @@ jobs:
 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:
 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:

-                  ubuntu: ${{ matrix.ubuntu }}
+                  flavour: ${{ matrix.flavour }}
+                  lua: ${{ matrix.lua }}

 
 

-            - name: Install test prerequsites
-              run: sudo apt-get install -y -qq python3-pytest python3-behave
-              if: matrix.ubuntu == 20
+            - name: Install test prerequsites (behave from apt)
+              run: sudo apt-get install -y -qq python3-behave
+              if: matrix.flavour == 'ubuntu-20'

 
 

-            - name: Install test prerequsites
-              run: pip3 install pylint pytest behave==1.2.6
-              if: ${{ (matrix.ubuntu == 18) || (matrix.ubuntu == 22) }}
+            - name: Install test prerequsites (behave from pip)
+              run: pip3 install behave==1.2.6
+              if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')

 
 

-            - name: Install test prerequsites
-              run: sudo apt-get install -y -qq python3-pytest
-              if: matrix.ubuntu == 22
+            - name: Install test prerequsites (from apt for Ununtu 2x)
+              run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn
+              if: matrix.flavour != 'oldstuff'
+
+            - name: Install newer pytest-asyncio
+              run: pip3 install -U pytest-asyncio
+              if: matrix.flavour == 'ubuntu-20'
+
+            - name: Install test prerequsites (from pip for Ubuntu 18)
+              run: pip3 install pytest pytest-asyncio uvicorn
+              if: matrix.flavour == 'oldstuff'
+
+            - name: Install Python webservers
+              run: pip3 install falcon sanic sanic-testing sanic-cors starlette

 
             - name: Install latest pylint
 
             - name: Install latest pylint

-              run: pip3 install pylint mypy types-PyYAML types-jinja2 types-psycopg2
+              run: pip3 install -U pylint asgi_lifespan

 
             - name: PHP linting
               run: phpcs --report-width=120 .
               working-directory: Nominatim
 
             - name: Python linting
 
             - name: PHP linting
               run: phpcs --report-width=120 .
               working-directory: Nominatim
 
             - name: Python linting

-              run: pylint nominatim
-              working-directory: Nominatim
-
-            - name: Python static typechecking
-              run: mypy --strict nominatim
+              run: python3 -m pylint nominatim

               working-directory: Nominatim
 
               working-directory: Nominatim
 

-

             - name: PHP unit tests
               run: phpunit ./
               working-directory: Nominatim/test/php
             - name: PHP unit tests
               run: phpunit ./
               working-directory: Nominatim/test/php

-              if: ${{ (matrix.ubuntu == 20) || (matrix.ubuntu == 22) }}

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

-              run: $PYTEST test/python
+              run: python3 -m pytest test/python

               working-directory: Nominatim
               working-directory: Nominatim

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

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

-                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
+                  python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3

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

+            - name: Install mypy and typechecking info
+              run: pip3 install -U mypy osmium uvicorn types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests types-ujson types-Pygments typing-extensions
+              if: matrix.flavour != 'oldstuff'
+
+            - name: Python static typechecking
+              run: python3 -m mypy --strict nominatim
+              working-directory: Nominatim
+              if: matrix.flavour != 'oldstuff'

 
     legacy-test:
         needs: create-archive
         runs-on: ubuntu-20.04
 
         steps:
 
     legacy-test:
         needs: create-archive
         runs-on: ubuntu-20.04
 
         steps:

-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v3

               with:
                   name: full-source
 
               with:
                   name: full-source
 


@@ -146,7 +163,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:

-                  php-version: 7.4
+                  php-version: '7.4'

 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:
 
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:


@@ -158,7 +175,6 @@ jobs:
 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:
 
             - uses: ./Nominatim/.github/actions/build-nominatim
               with:

-                  ubuntu: 20

                   cmake-args: -DBUILD_MODULE=on
 
             - name: Install test prerequsites
                   cmake-args: -DBUILD_MODULE=on
 
             - name: Install test prerequsites


@@ -166,7 +182,7 @@ jobs:
 
             - name: BDD tests (legacy tokenizer)
               run: |
 
             - name: BDD tests (legacy tokenizer)
               run: |

-                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy --format=progress3
+                  python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy --format=progress3

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


@@ -176,20 +192,13 @@ jobs:
 
         strategy:
             matrix:
 
         strategy:
             matrix:

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

                 include:
                 include:

-                    - name: Ubuntu-18
-                      flavour: ubuntu
-                      image: "ubuntu:18.04"
-                      ubuntu: 18
-                      install_mode: install-nginx

                     - name: Ubuntu-20
                     - name: Ubuntu-20

-                      flavour: ubuntu

                       image: "ubuntu:20.04"
                       ubuntu: 20
                       install_mode: install-apache
                     - name: Ubuntu-22
                       image: "ubuntu:20.04"
                       ubuntu: 20
                       install_mode: install-apache
                     - name: Ubuntu-22

-                      flavour: ubuntu

                       image: "ubuntu:22.04"
                       ubuntu: 22
                       install_mode: install-apache
                       image: "ubuntu:22.04"
                       ubuntu: 22
                       install_mode: install-apache


@@ -212,14 +221,6 @@ jobs:
                   apt-get install -y git sudo wget
                   ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
               shell: bash
                   apt-get install -y git sudo wget
                   ln -snf /usr/share/zoneinfo/$CONTAINER_TIMEZONE /etc/localtime && echo $CONTAINER_TIMEZONE > /etc/timezone
               shell: bash

-              if: matrix.flavour == 'ubuntu'
-
-            - name: Prepare container (CentOS)
-              run: |
-                  dnf update -y
-                  dnf install -y sudo glibc-langpack-en
-              shell: bash
-              if: matrix.flavour == 'centos'

 
             - name: Setup import user
               run: |
 
             - name: Setup import user
               run: |


@@ -231,7 +232,7 @@ jobs:
                 OS: ${{ matrix.name }}
                 INSTALL_MODE: ${{ matrix.install_mode }}
 
                 OS: ${{ matrix.name }}
                 INSTALL_MODE: ${{ matrix.install_mode }}
 

-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v3

               with:
                   name: full-source
                   path: /home/nominatim
               with:
                   name: full-source
                   path: /home/nominatim


@@ -253,18 +254,14 @@ jobs:
                   mkdir data-env-reverse
               working-directory: /home/nominatim
 
                   mkdir data-env-reverse
               working-directory: /home/nominatim
 

-            - name: Prepare import environment (CentOS)
-              run: |
-                  sudo ln -s /usr/local/bin/nominatim /usr/bin/nominatim
-                  echo NOMINATIM_DATABASE_WEBUSER="apache" > nominatim-project/.env
-                  cp nominatim-project/.env data-env-reverse/.env
-              working-directory: /home/nominatim
-              if: matrix.flavour == 'centos'
-

             - name: Print version
               run: nominatim --version
               working-directory: /home/nominatim/nominatim-project
 
             - name: Print version
               run: nominatim --version
               working-directory: /home/nominatim/nominatim-project
 

+            - name: Collect host OS information
+              run: nominatim admin --collect-os-info
+              working-directory: /home/nominatim/nominatim-project
+

             - name: Import
               run: nominatim import --osm-file ../test.pbf
               working-directory: /home/nominatim/nominatim-project
             - name: Import
               run: nominatim import --osm-file ../test.pbf
               working-directory: /home/nominatim/nominatim-project


@@ -284,7 +281,6 @@ jobs:
             - name: Prepare update (Ubuntu)
               run: apt-get install -y python3-pip
               shell: bash
             - name: Prepare update (Ubuntu)
               run: apt-get install -y python3-pip
               shell: bash

-              if: matrix.flavour == 'ubuntu'

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