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 e0e68a9c42303af52b52bf0a0a76695ef9ad552c..1c5fc735df32a0621513c9567a2878ea93b917d5 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
+              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 .


@@ -57,19 +57,48 @@ jobs:
               working-directory: Nominatim
 
             - name: PHP unit tests
               working-directory: Nominatim
 
             - name: PHP unit tests

-              run: phpunit ./
+              run: phpunit --coverage-clover ../../coverage-php.xml ./

               working-directory: Nominatim/test/php
 
             - name: Python unit tests
               working-directory: Nominatim/test/php
 
             - name: Python unit tests

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

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

-              run: behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
+              run: |
+                  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: BDD tests (legacy_icu tokenizer)
+              run: |
+                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy_icu --format=progress3

               working-directory: Nominatim/test/bdd
 
               working-directory: Nominatim/test/bdd
 

+            - name: Upload coverage to Codecov
+              uses: codecov/codecov-action@v1
+              with:
+                files: ./Nominatim/coverage*.xml
+                directory: ./
+                name: codecov-umbrella
+                fail_ci_if_error: false
+                path_to_write_report: ./coverage/codecov_report.txt
+                verbose: true
+

     import:
     import:

-        runs-on: ubuntu-20.04
+        strategy:
+            matrix:
+                ubuntu: [18, 20]
+                include:
+                    - ubuntu: 18
+                      postgresql: 9.5
+                      postgis: 2.5
+                    - ubuntu: 20
+                      postgresql: 13
+                      postgis: 3
+
+        runs-on: ubuntu-${{ matrix.ubuntu }}.04

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


@@ -95,12 +124,24 @@ jobs:
                      monaco-latest.osm.pbf
                   key: nominatim-test-data-${{ steps.get-date.outputs.date }}
 
                      monaco-latest.osm.pbf
                   key: nominatim-test-data-${{ steps.get-date.outputs.date }}
 

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

             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:
             - uses: ./Nominatim/.github/actions/setup-postgresql
               with:

-                  postgresql-version: 13
-                  postgis-version: 3
+                  postgresql-version: ${{ matrix.postgresql }}
+                  postgis-version: ${{ matrix.postgis }}

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

+            - name: Install extra dependencies for Ubuntu 18
+              run: |
+                sudo apt-get install libicu-dev
+                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu osmium
+              shell: bash
+              if: matrix.ubuntu == 18
+

             - name: Clean installation
               run: rm -rf Nominatim build
               shell: bash
             - name: Clean installation
               run: rm -rf Nominatim build
               shell: bash


@@ -120,13 +161,17 @@ jobs:
               working-directory: data-env
 
             - name: Import special phrases
               working-directory: data-env
 
             - name: Import special phrases

-              run: nominatim special-phrases --from-wiki | psql -d nominatim
+              run: nominatim special-phrases --import-from-wiki

               working-directory: data-env
 
               working-directory: data-env
 

-            - name: Check import
+            - name: Check full import

               run: nominatim admin --check-database
               working-directory: data-env
 
               run: nominatim admin --check-database
               working-directory: data-env
 

+            - name: Warm up database
+              run: nominatim admin --warm
+              working-directory: data-env
+

             - name: Run update
               run: |
                    nominatim replication --init
             - name: Run update
               run: |
                    nominatim replication --init


@@ -134,7 +179,11 @@ jobs:
               working-directory: data-env
 
             - name: Run reverse-only import
               working-directory: data-env
 
             - name: Run reverse-only import

-              run : nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only
+              run : nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only --no-updates

               working-directory: data-env
               env:
                   NOMINATIM_DATABASE_DSN: pgsql:dbname=reverse
               working-directory: data-env
               env:
                   NOMINATIM_DATABASE_DSN: pgsql:dbname=reverse

+
+            - name: Check reverse import
+              run: nominatim admin --check-database
+              working-directory: data-env