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 93cd9119431926500499af809b2f114bfc9dd298..7dfb3f1d34b0b677940abf7695986fcd87070001 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -72,8 +72,10 @@ 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:


@@ -99,11 +101,15 @@ jobs:
               if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
 
             - name: Install test prerequsites (from apt for Ununtu 2x)
               if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
 
             - name: Install test prerequsites (from apt for Ununtu 2x)

-              run: sudo apt-get install -y -qq python3-pytest uvicorn
+              run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn

               if: matrix.flavour != 'oldstuff'
 
               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
+              run: pip3 install pytest pytest-asyncio uvicorn

               if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers
               if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers


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


@@ -135,7 +140,7 @@ jobs:
               working-directory: Nominatim/test/bdd
 
             - name: Install mypy and typechecking info
               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 typing-extensions
+              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
               if: matrix.flavour != 'oldstuff'
 
             - name: Python static typechecking