actions: enable sqlite testing

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 70392d79284728218a4ad593b42323c178dc25c7..17ff0ccfc14d391958309bae4020e598523b69e5 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -25,12 +25,12 @@ runs:
           shell: bash
         - name: Install${{ matrix.flavour }} prerequisites
           run: |
           shell: bash
         - name: Install${{ matrix.flavour }} prerequisites
           run: |

-            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${LUA_VERSION} lua-dkjson nlohmann-json3-dev
+            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${LUA_VERSION} lua-dkjson nlohmann-json3-dev libspatialite7 libsqlite3-mod-spatialite

             if [ "$FLAVOUR" == "oldstuff" ]; then
             if [ "$FLAVOUR" == "oldstuff" ]; then

-                pip3 install MarkupSafe==2.0.1 python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4.31 datrie asyncpg
+                pip3 install MarkupSafe==2.0.1 python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4.31 datrie asyncpg aiosqlite

             else
                 sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml
             else
                 sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml

-                pip3 install sqlalchemy psycopg
+                pip3 install sqlalchemy psycopg aiosqlite

             fi
           shell: bash
           env:
             fi
           shell: bash
           env:

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 1d34ed1ac312edcfd5cf3b5ac9b97fdfb02cbbb3..1dade3bcfa28c3b4a43e2b73aa5882ba66238d33 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -113,18 +113,21 @@ jobs:
               if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers
               if: matrix.flavour == 'oldstuff'
 
             - name: Install Python webservers

-              run: pip3 install falcon starlette
+              run: pip3 install falcon starlette asgi_lifespan

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

-              run: pip3 install -U pylint asgi_lifespan
+              run: pip3 install -U pylint
+              if: matrix.flavour != 'oldstuff'

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

+              if: matrix.flavour != 'oldstuff'

 
             - name: Python linting
               run: python3 -m pylint nominatim
               working-directory: Nominatim
 
             - name: Python linting
               run: python3 -m pylint nominatim
               working-directory: Nominatim

+              if: matrix.flavour != 'oldstuff'

 
             - name: PHP unit tests
               run: phpunit ./
 
             - name: PHP unit tests
               run: phpunit ./