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 a1a4344a1105c17c81582298da361f4f25a4731c..1c5fc735df32a0621513c9567a2878ea93b917d5 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -71,18 +71,34 @@ jobs:
                   vendor/bin/phpcov merge --clover ../../coverage-bdd.xml ./cov
               working-directory: Nominatim/test/bdd
 
                   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
+

             - name: Upload coverage to Codecov
               uses: codecov/codecov-action@v1
               with:
                 files: ./Nominatim/coverage*.xml
                 directory: ./
                 name: codecov-umbrella
             - name: Upload coverage to Codecov
               uses: codecov/codecov-action@v1
               with:
                 files: ./Nominatim/coverage*.xml
                 directory: ./
                 name: codecov-umbrella

-                fail_ci_if_error: true
+                fail_ci_if_error: false

                 path_to_write_report: ./coverage/codecov_report.txt
                 verbose: true
 
     import:
                 path_to_write_report: ./coverage/codecov_report.txt
                 verbose: true
 
     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


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


@@ -136,10 +164,14 @@ jobs:
               run: nominatim special-phrases --import-from-wiki
               working-directory: data-env
 
               run: nominatim special-phrases --import-from-wiki
               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


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