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 9b51a90bddb524b477cdac31329f419e2213426f..48de6e0d51d50514ad5074f25f671c3c0d2b9e46 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -37,20 +37,26 @@ 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
-                      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

-                      php: 7.4
-                    - ubuntu: 22
+                      php: '7.4'
+                      lua: '5.3'
+                    - flavour: ubuntu-22
+                      ubuntu: 22

                       postgresql: 15
                       postgis: 3
                       postgresql: 15
                       postgis: 3

-                      php: 8.1
+                      php: '8.1'
+                      lua: '5.3'

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


@@ -66,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@v4
               with:
 
             - uses: actions/setup-python@v4
               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:


@@ -81,29 +89,34 @@ 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 (behave from apt)
               run: sudo apt-get install -y -qq python3-behave
 
             - name: Install test prerequsites (behave from apt)
               run: sudo apt-get install -y -qq python3-behave

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

 
             - name: Install test prerequsites (behave from pip)
               run: pip3 install behave==1.2.6
 
             - name: Install test prerequsites (behave from pip)
               run: pip3 install behave==1.2.6

-              if: ${{ (matrix.ubuntu == 18) || (matrix.ubuntu == 22) }}
+              if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')

 
             - name: Install test prerequsites (from apt for Ununtu 2x)
 
             - name: Install test prerequsites (from apt for Ununtu 2x)

-              run: sudo apt-get install -y -qq python3-pytest uvicorn
-              if: matrix.ubuntu >= 20
+              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)
 
             - name: Install test prerequsites (from pip for Ubuntu 18)

-              run: pip3 install pytest uvicorn
-              if: matrix.ubuntu == 18
+              run: pip3 install pytest pytest-asyncio uvicorn
+              if: matrix.flavour == 'oldstuff'

 
             - name: Install Python webservers
 
             - name: Install Python webservers

-              run: pip3 install falcon sanic sanic-testing starlette
+              run: pip3 install falcon starlette

 
 

-            - name: Install latest pylint/mypy
-              run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests typing-extensions asgi_lifespan sqlalchemy2-stubs
+            - name: Install latest pylint
+              run: pip3 install -U pylint asgi_lifespan

 
             - name: PHP linting
               run: phpcs --report-width=120 .
 
             - name: PHP linting
               run: phpcs --report-width=120 .


@@ -116,7 +129,6 @@ jobs:
             - 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
               run: python3 -m pytest test/python
 
             - name: Python unit tests
               run: python3 -m pytest test/python


@@ -127,12 +139,14 @@ jobs:
                   python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
               working-directory: Nominatim/test/bdd
 
                   python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
               working-directory: Nominatim/test/bdd
 

-            - name: Install newer Python packages (for typechecking info)
-              run: pip3 install -U osmium uvicorn
+            - 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
 
             - name: Python static typechecking
               run: python3 -m mypy --strict nominatim
               working-directory: Nominatim

+              if: matrix.flavour != 'oldstuff'

 
     legacy-test:
         needs: create-archive
 
     legacy-test:
         needs: create-archive


@@ -149,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:


@@ -161,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


@@ -173,26 +186,52 @@ jobs:
               working-directory: Nominatim/test/bdd
 
 
               working-directory: Nominatim/test/bdd
 
 

+    python-api-test:
+        needs: create-archive
+        runs-on: ubuntu-22.04
+
+        steps:
+            - uses: actions/download-artifact@v3
+              with:
+                  name: full-source
+
+            - name: Unpack Nominatim
+              run: tar xf nominatim-src.tar.bz2
+
+            - uses: ./Nominatim/.github/actions/setup-postgresql
+              with:
+                  postgresql-version: 15
+                  postgis-version: 3
+
+            - uses: ./Nominatim/.github/actions/build-nominatim
+              with:
+                  flavour: 'ubuntu-22'
+
+            - name: Install test prerequsites
+              run: sudo apt-get install -y -qq python3-behave
+
+            - name: Install Python webservers
+              run: pip3 install starlette asgi_lifespan httpx
+
+            - name: BDD tests (starlette)
+              run: |
+                  python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=starlette --format=progress3
+              working-directory: Nominatim/test/bdd
+
+

     install:
         runs-on: ubuntu-latest
         needs: create-archive
 
         strategy:
             matrix:
     install:
         runs-on: ubuntu-latest
         needs: create-archive
 
         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


@@ -215,14 +254,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: |


@@ -252,26 +283,25 @@ 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
 

-            - 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: 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: 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


@@ -291,7 +321,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: |