automatic migration from 3.6 release

[nominatim.git] / .github / workflows / ci-tests.yml

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index f1da461686f148db0a438c2f0432c6dfac962198..e0e68a9c42303af52b52bf0a0a76695ef9ad552c 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -6,10 +6,26 @@ jobs:
     tests:
         runs-on: ubuntu-20.04
 
     tests:
         runs-on: ubuntu-20.04
 

+        strategy:
+            matrix:
+                postgresql: [9.5, 13]
+                include:
+                    - postgresql: 9.5
+                      postgis: 2.5
+                    - postgresql: 13
+                      postgis: 3
+

         steps:
             - uses: actions/checkout@v2
               with:
                   submodules: true
         steps:
             - uses: actions/checkout@v2
               with:
                   submodules: true

+                  path: Nominatim
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.4'
+                  tools: phpunit, phpcs

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


@@ -20,28 +36,37 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - uses: actions/cache@v2
               with:
                   path: |

-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
-                  key: nominatim-data-${{ steps.get-date.outputs.date }}
+                     country_grid.sql.gz
+                  key: nominatim-country-data-${{ steps.get-date.outputs.date }}

 
 

-            - uses: ./.github/actions/setup-postgresql
-            - uses: ./.github/actions/build-nominatim
+            - uses: ./Nominatim/.github/actions/setup-postgresql
+              with:
+                  postgresql-version: ${{ matrix.postgresql }}
+                  postgis-version: ${{ matrix.postgis }}
+            - uses: ./Nominatim/.github/actions/build-nominatim

 
             - name: Install test prerequsites
 
             - name: Install test prerequsites

-              run: |
-                   sudo apt-get install -y -qq php-codesniffer python3-tidylib
-                   sudo pip3 install behave nose
+              run: sudo apt-get install -y -qq php-codesniffer pylint python3-pytest python3-behave

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

+              working-directory: Nominatim
+
+            - name: Python linting
+              run: pylint --extension-pkg-whitelist=osmium nominatim
+              working-directory: Nominatim

 
             - name: PHP unit tests
               run: phpunit ./
 
             - name: PHP unit tests
               run: phpunit ./

-              working-directory: test/php
+              working-directory: Nominatim/test/php
+
+            - name: Python unit tests
+              run: py.test-3 test/python
+              working-directory: Nominatim

 
             - name: BDD tests
 
             - name: BDD tests

-              run: behave -DREMOVE_TEMPLATE=1 --format=progress3 db osm2pgsql
-              working-directory: test/bdd
+              run: behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
+              working-directory: Nominatim/test/bdd

 
     import:
         runs-on: ubuntu-20.04
 
     import:
         runs-on: ubuntu-20.04


@@ -50,6 +75,7 @@ jobs:
             - uses: actions/checkout@v2
               with:
                   submodules: true
             - uses: actions/checkout@v2
               with:
                   submodules: true

+                  path: Nominatim

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


@@ -60,46 +86,55 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - uses: actions/cache@v2
               with:
                   path: |

-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
-                  key: nominatim-data-${{ steps.get-date.outputs.date }}
+                     country_grid.sql.gz
+                  key: nominatim-country-data-${{ steps.get-date.outputs.date }}

 
 

-            - uses: ./.github/actions/setup-postgresql
-            - uses: ./.github/actions/build-nominatim
+            - uses: actions/cache@v2
+              with:
+                  path: |
+                     monaco-latest.osm.pbf
+                  key: nominatim-test-data-${{ steps.get-date.outputs.date }}

 
 

-            - name: Create configuration
-              run: |
-                   echo '<?php' > settings/local.php
-                   echo " @define('CONST_Pyosmium_Binary', '/usr/lib/python3-pyosmium/pyosmium-get-changes');" >> settings/local.php
-              working-directory: build
+            - uses: ./Nominatim/.github/actions/setup-postgresql
+              with:
+                  postgresql-version: 13
+                  postgis-version: 3
+            - uses: ./Nominatim/.github/actions/build-nominatim

 
 

-            - name: Download import data
+            - name: Clean installation
+              run: rm -rf Nominatim build
+              shell: bash
+
+            - name: Prepare import environment

               run: |
                   if [ ! -f monaco-latest.osm.pbf ]; then
                       wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
                   fi
               run: |
                   if [ ! -f monaco-latest.osm.pbf ]; then
                       wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
                   fi

+                  mkdir data-env
+                  cd data-env

               shell: bash
 
             - name: Import
               shell: bash
 
             - name: Import

-              run: php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --osm2pgsql-cache 500 --all
-              working-directory: build
+              run: nominatim import --osm-file ../monaco-latest.osm.pbf
+              shell: bash
+              working-directory: data-env

 
             - name: Import special phrases
 
             - name: Import special phrases

-              run: php ./utils/specialphrases.php --wiki-import | psql -d nominatim
-              working-directory: build
+              run: nominatim special-phrases --from-wiki | psql -d nominatim
+              working-directory: data-env

 
             - name: Check import
 
             - name: Check import

-              run: php ./utils/check_import_finished.php
-              working-directory: build
+              run: nominatim admin --check-database
+              working-directory: data-env

 
             - name: Run update
               run: |
 
             - name: Run update
               run: |

-                   php ./utils/update.php --init-updates
-                   php ./utils/update.php --import-osmosis
-              working-directory: build
+                   nominatim replication --init
+                   nominatim replication --once
+              working-directory: data-env

 
             - name: Run reverse-only import
 
             - name: Run reverse-only import

-              run : |
-                  dropdb nominatim
-                  php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --reverse-only --all
-              working-directory: build
+              run : nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only
+              working-directory: data-env
+              env:
+                  NOMINATIM_DATABASE_DSN: pgsql:dbname=reverse