CI: run tests on older Ubuntu version as well

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index a391561636e1478536e5dd080baad0e7faa5ddcd..757decd4f63c7379033ac956acb38cf6c12b0cad 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -14,9 +14,9 @@ runs:
           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
             if [ "x$UBUNTUVER" == "x18" ]; then
           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
             if [ "x$UBUNTUVER" == "x18" ]; then

-                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu osmium
+                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu osmium PyYAML==5.1 datrie

             else
             else

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

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 8f0ea80db89b214ba2bf989a9854534d86123eae..c6792f3ae6c4196ef597a628c4c5d335d7b36edd 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -4,16 +4,20 @@ on: [ push, pull_request ]
 
 jobs:
     tests:
 
 jobs:
     tests:

-        runs-on: ubuntu-20.04
-

         strategy:
             matrix:
         strategy:
             matrix:

-                postgresql: [9.5, 13]
+                ubuntu: [18, 20]

                 include:
                 include:

-                    - postgresql: 9.5
+                    - ubuntu: 18
+                      postgresql: 9.5

                       postgis: 2.5
                       postgis: 2.5

-                    - postgresql: 13
+                      pytest: pytest
+                    - ubuntu: 20
+                      postgresql: 13

                       postgis: 3
                       postgis: 3

+                      pytest: py.test-3
+
+        runs-on: ubuntu-${{ matrix.ubuntu }}.04

 
         steps:
             - uses: actions/checkout@v2
 
         steps:
             - uses: actions/checkout@v2


@@ -27,6 +31,11 @@ jobs:
                   php-version: '7.4'
                   tools: phpunit, phpcs, composer
 
                   php-version: '7.4'
                   tools: phpunit, phpcs, composer
 

+            - uses: actions/setup-python@v2
+              with:
+                python-version: 3.6
+              if: matrix.ubuntu == 18
+

             - name: Get Date
               id: get-date
               run: |
             - name: Get Date
               id: get-date
               run: |


@@ -43,17 +52,27 @@ jobs:
               with:
                   postgresql-version: ${{ matrix.postgresql }}
                   postgis-version: ${{ matrix.postgis }}
               with:
                   postgresql-version: ${{ matrix.postgresql }}
                   postgis-version: ${{ matrix.postgis }}

+

             - uses: ./Nominatim/.github/actions/build-nominatim
             - uses: ./Nominatim/.github/actions/build-nominatim

+              with:
+                  ubuntu: ${{ matrix.ubuntu }}

 
             - name: Install test prerequsites
               run: sudo apt-get install -y -qq php-codesniffer pylint python3-pytest python3-behave python3-pytest-cov php-codecoverage php-xdebug
 
             - name: Install test prerequsites
               run: sudo apt-get install -y -qq php-codesniffer pylint python3-pytest python3-behave python3-pytest-cov php-codecoverage php-xdebug

+              if: matrix.ubuntu == 20
+
+            - name: Install test prerequsites
+              run: |
+                   sudo apt-get install -y -qq php-codesniffer php-codecoverage php-xdebug
+                   pip3 install pylint==2.6.0 pytest pytest-cov behave==1.2.6
+              if: matrix.ubuntu == 18

 
             - 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 --extension-pkg-whitelist=osmium nominatim
+              run: pylint nominatim

               working-directory: Nominatim
 
             - name: PHP unit tests
               working-directory: Nominatim
 
             - name: PHP unit tests


@@ -61,11 +80,14 @@ jobs:
               working-directory: Nominatim/test/php
 
             - name: Python unit tests
               working-directory: Nominatim/test/php
 
             - name: Python unit tests

-              run: py.test-3 --cov=nominatim --cov-report=xml test/python
+              run: $PYTEST --cov=nominatim --cov-report=xml test/python

               working-directory: Nominatim
               working-directory: Nominatim

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

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

+                  mkdir cov

                   behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 -DPHPCOV=./cov
                   composer require phpunit/phpcov:7.0.2
                   vendor/bin/phpcov merge --clover ../../coverage-bdd.xml ./cov
                   behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3 -DPHPCOV=./cov
                   composer require phpunit/phpcov:7.0.2
                   vendor/bin/phpcov merge --clover ../../coverage-bdd.xml ./cov