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 c0d0dcea6f66c30363bc1fd8a1b52262f5156c00..a1a4344a1105c17c81582298da361f4f25a4731c 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -25,7 +25,7 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: '7.4'
               uses: shivammathur/setup-php@v2
               with:
                   php-version: '7.4'

-                  tools: phpunit, phpcs
+                  tools: phpunit, phpcs, composer

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


@@ -46,7 +46,7 @@ jobs:
             - uses: ./Nominatim/.github/actions/build-nominatim
 
             - name: Install test prerequsites
             - uses: ./Nominatim/.github/actions/build-nominatim
 
             - name: Install test prerequsites

-              run: sudo apt-get install -y -qq php-codesniffer pylint python3-pytest python3-behave python3-coverage
+              run: sudo apt-get install -y -qq php-codesniffer pylint python3-pytest python3-behave python3-pytest-cov php-codecoverage php-xdebug

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


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

-              run: |
-                  python3-coverage run -m pytest ./test/python
-                  python3-coverage xml -o ./coverage-pytest.xml
-
+              run: py.test-3 --cov=nominatim --cov-report=xml test/python

               working-directory: Nominatim
 
             - name: BDD tests
               run: |
               working-directory: Nominatim
 
             - name: BDD tests
               run: |

-                  python3-coverage run -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
-                  python3-coverage xml -o ../../coverage-bdd.xml
-
+                  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

               working-directory: Nominatim/test/bdd
 
             - name: Upload coverage to Codecov
               working-directory: Nominatim/test/bdd
 
             - name: Upload coverage to Codecov


@@ -79,7 +76,6 @@ jobs:
               with:
                 files: ./Nominatim/coverage*.xml
                 directory: ./
               with:
                 files: ./Nominatim/coverage*.xml
                 directory: ./

-                flags: unittests

                 name: codecov-umbrella
                 fail_ci_if_error: true
                 path_to_write_report: ./coverage/codecov_report.txt
                 name: codecov-umbrella
                 fail_ci_if_error: true
                 path_to_write_report: ./coverage/codecov_report.txt