Merge pull request #2818 from lonvia/better-geometry-index

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 4ce14f9365eb96ef04b184e00eb93962c4674fc9..a26ad0001a357ee99b1c5cdacca37c5e7db6643c 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -37,7 +37,7 @@ jobs:
         needs: create-archive
         strategy:
             matrix:
         needs: create-archive
         strategy:
             matrix:

-                ubuntu: [18, 20]
+                ubuntu: [18, 20, 22]

                 include:
                     - ubuntu: 18
                       postgresql: 9.6
                 include:
                     - ubuntu: 18
                       postgresql: 9.6


@@ -49,6 +49,11 @@ jobs:
                       postgis: 3
                       pytest: py.test-3
                       php: 7.4
                       postgis: 3
                       pytest: py.test-3
                       php: 7.4

+                    - ubuntu: 22
+                      postgresql: 14
+                      postgis: 3
+                      pytest: py.test-3
+                      php: 8.1

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


@@ -65,6 +70,7 @@ jobs:
               with:
                   php-version: ${{ matrix.php }}
                   tools: phpunit, phpcs, composer
               with:
                   php-version: ${{ matrix.php }}
                   tools: phpunit, phpcs, composer

+                  ini-values: opcache.jit=disable

 
             - uses: actions/setup-python@v2
               with:
 
             - uses: actions/setup-python@v2
               with:


@@ -85,11 +91,15 @@ jobs:
               if: matrix.ubuntu == 20
 
             - name: Install test prerequsites
               if: matrix.ubuntu == 20
 
             - name: Install test prerequsites

-              run: pip3 install pytest behave==1.2.6
-              if: matrix.ubuntu == 18
+              run: pip3 install pylint pytest behave==1.2.6
+              if: ${{ (matrix.ubuntu == 18) || (matrix.ubuntu == 22) }}

 
 

-            - name: Install latest pylint
-              run: pip3 install pylint
+            - name: Install test prerequsites
+              run: sudo apt-get install -y -qq python3-pytest
+              if: matrix.ubuntu == 22
+
+            - name: Install latest pylint/mypy
+              run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil typing-extensions

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


@@ -99,10 +109,15 @@ jobs:
               run: pylint nominatim
               working-directory: Nominatim
 
               run: pylint nominatim
               working-directory: Nominatim
 

+            - name: Python static typechecking
+              run: mypy --strict 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
+              if: ${{ (matrix.ubuntu == 20) || (matrix.ubuntu == 22) }}

 
             - name: Python unit tests
               run: $PYTEST test/python
 
             - name: Python unit tests
               run: $PYTEST test/python


@@ -161,7 +176,7 @@ jobs:
 
         strategy:
             matrix:
 
         strategy:
             matrix:

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

                 include:
                     - name: Ubuntu-18
                       flavour: ubuntu
                 include:
                     - name: Ubuntu-18
                       flavour: ubuntu


@@ -173,6 +188,11 @@ jobs:
                       image: "ubuntu:20.04"
                       ubuntu: 20
                       install_mode: install-apache
                       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

 
         container:
             image: ${{ matrix.image }}
 
         container:
             image: ${{ matrix.image }}


@@ -245,6 +265,10 @@ jobs:
               run: nominatim --version
               working-directory: /home/nominatim/nominatim-project
 
               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