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 f326c3caed7897e2f625d31631e116d909c7ddb3..a08a995f9c5459c9a3bee7bc214db019887b7eb0 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -40,7 +40,7 @@ jobs:
                 ubuntu: [18, 20]
                 include:
                     - ubuntu: 18
                 ubuntu: [18, 20]
                 include:
                     - ubuntu: 18

-                      postgresql: 9.5
+                      postgresql: 9.6

                       postgis: 2.5
                       pytest: pytest
                       php: 7.2
                       postgis: 2.5
                       pytest: pytest
                       php: 7.2


@@ -64,7 +64,6 @@ jobs:
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}

-                  coverage: xdebug

                   tools: phpunit, phpcs, composer
 
             - uses: actions/setup-python@v2
                   tools: phpunit, phpcs, composer
 
             - uses: actions/setup-python@v2


@@ -82,11 +81,11 @@ jobs:
                   ubuntu: ${{ matrix.ubuntu }}
 
             - name: Install test prerequsites
                   ubuntu: ${{ matrix.ubuntu }}
 
             - name: Install test prerequsites

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

               if: matrix.ubuntu == 20
 
             - name: Install test prerequsites
               if: matrix.ubuntu == 20
 
             - name: Install test prerequsites

-              run: pip3 install pylint==2.6.0 pytest pytest-cov behave==1.2.6
+              run: pip3 install pylint==2.6.0 pytest behave==1.2.6

               if: matrix.ubuntu == 18
 
             - name: PHP linting
               if: matrix.ubuntu == 18
 
             - name: PHP linting


@@ -98,56 +97,25 @@ jobs:
               working-directory: Nominatim
 
             - name: PHP unit tests
               working-directory: Nominatim
 
             - name: PHP unit tests

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

               working-directory: Nominatim/test/php
               if: matrix.ubuntu == 20
 
             - name: Python unit tests
               working-directory: Nominatim/test/php
               if: matrix.ubuntu == 20
 
             - name: Python unit tests

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

               working-directory: Nominatim
               env:
                 PYTEST: ${{ matrix.pytest }}
 
               working-directory: Nominatim
               env:
                 PYTEST: ${{ matrix.pytest }}
 

-            - 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
-              working-directory: Nominatim/test/bdd
-              if: matrix.ubuntu == 20
-

             - name: BDD tests
               run: |
                   behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
               working-directory: Nominatim/test/bdd
             - name: BDD tests
               run: |
                   behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
               working-directory: Nominatim/test/bdd

-              if: matrix.ubuntu == 18
-
-            - 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
-              if: matrix.ubuntu == 20

 
 
 
 

-    icu-test:
+    legacy-test:

         needs: create-archive
         needs: create-archive

-        strategy:
-            matrix:
-                ubuntu: [20]
-                include:
-                    - ubuntu: 20
-                      postgresql: 13
-                      postgis: 3
-                      pytest: py.test-3
-                      php: 7.4
-
-        runs-on: ubuntu-${{ matrix.ubuntu }}.04
+        runs-on: ubuntu-20.04

 
         steps:
             - uses: actions/download-artifact@v2
 
         steps:
             - uses: actions/download-artifact@v2


@@ -160,35 +128,27 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:

-                  php-version: ${{ matrix.php }}
-                  coverage: xdebug
-                  tools: phpunit, phpcs, composer
-
-            - uses: actions/setup-python@v2
-              with:
-                python-version: 3.6
-              if: matrix.ubuntu == 18
+                  php-version: 7.4

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

-                  postgresql-version: ${{ matrix.postgresql }}
-                  postgis-version: ${{ matrix.postgis }}
+                  postgresql-version: 13
+                  postgis-version: 3
+
+            - name: Install Postgresql server dev
+              run: sudo apt-get install postgresql-server-dev-13

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

-                  ubuntu: ${{ matrix.ubuntu }}
+                  ubuntu: 20
+                  cmake-args: -DBUILD_MODULE=on

 
             - name: Install test prerequsites
               run: sudo apt-get install -y -qq python3-behave
 
             - name: Install test prerequsites
               run: sudo apt-get install -y -qq python3-behave

-              if: matrix.ubuntu == 20

 
 

-            - name: Install test prerequsites
-              run: pip3 install behave==1.2.6
-              if: matrix.ubuntu == 18
-
-            - name: BDD tests (icu tokenizer)
+            - name: BDD tests (legacy tokenizer)

               run: |
               run: |

-                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=icu --format=progress3
+                  behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DTOKENIZER=legacy --format=progress3

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


@@ -198,7 +158,7 @@ jobs:
 
         strategy:
             matrix:
 
         strategy:
             matrix:

-                name: [Ubuntu-18, Ubuntu-20, Centos-8]
+                name: [Ubuntu-18, Ubuntu-20]

                 include:
                     - name: Ubuntu-18
                       flavour: ubuntu
                 include:
                     - name: Ubuntu-18
                       flavour: ubuntu


@@ -210,9 +170,6 @@ jobs:
                       image: "ubuntu:20.04"
                       ubuntu: 20
                       install_mode: install-apache
                       image: "ubuntu:20.04"
                       ubuntu: 20
                       install_mode: install-apache

-                    - name: Centos-8
-                      flavour: centos
-                      image: "centos:8"

 
         container:
             image: ${{ matrix.image }}
 
         container:
             image: ${{ matrix.image }}


@@ -281,6 +238,10 @@ jobs:
               working-directory: /home/nominatim
               if: matrix.flavour == 'centos'
 
               working-directory: /home/nominatim
               if: matrix.flavour == 'centos'
 

+            - name: Print version
+              run: nominatim --version
+              working-directory: /home/nominatim/nominatim-project
+

             - name: Import
               run: nominatim import --osm-file ../test.pbf
               working-directory: /home/nominatim/nominatim-project
             - name: Import
               run: nominatim import --osm-file ../test.pbf
               working-directory: /home/nominatim/nominatim-project