X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f21853ea9dcc50c468d0c92ba301fd2b4fd94325..3dd67083b27f996b55a4a359198109cfd6f15b4e:/.github/workflows/ci-tests.yml

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index f1da4616..e57431c0 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -6,11 +6,26 @@ jobs:
     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
 
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.4'
+                  tools: phpunit, phpcs
+
             - name: Get Date
               id: get-date
               run: |
@@ -20,17 +35,20 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
+                     {{ github.workspace }}/data/country_osm_grid.sql.gz
+                     {{ github.workspace }}/monaco-latest.osm.pbf
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
+              with:
+                  postgresql-version: ${{ matrix.postgresql }}
+                  postgis-version: ${{ matrix.postgis }}
             - uses: ./.github/actions/build-nominatim
 
             - name: Install test prerequsites
               run: |
-                   sudo apt-get install -y -qq php-codesniffer python3-tidylib
-                   sudo pip3 install behave nose
+                   sudo apt-get install -y -qq php-codesniffer
+                   sudo pip3 install behave
 
             - name: PHP linting
               run: phpcs --report-width=120 .
@@ -40,7 +58,7 @@ jobs:
               working-directory: test/php
 
             - name: BDD tests
-              run: behave -DREMOVE_TEMPLATE=1 --format=progress3 db osm2pgsql
+              run: behave -DREMOVE_TEMPLATE=1 --format=progress3
               working-directory: test/bdd
 
     import:
@@ -60,17 +78,19 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
+                     {{ github.workspace }}/data/country_osm_grid.sql.gz
+                     {{ github.workspace }}/monaco-latest.osm.pbf
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
+              with:
+                  postgresql-version: 13
+                  postgis-version: 3
             - uses: ./.github/actions/build-nominatim
 
             - name: Create configuration
               run: |
-                   echo '<?php' > settings/local.php
-                   echo " @define('CONST_Pyosmium_Binary', '/usr/lib/python3-pyosmium/pyosmium-get-changes');" >> settings/local.php
+                   echo "NOMINATIM_PYOSMIUM_BINARY=/usr/lib/python3-pyosmium/pyosmium-get-changes" >> .env
               working-directory: build
 
             - name: Download import data
@@ -81,25 +101,25 @@ jobs:
               shell: bash
 
             - name: Import
-              run: php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --osm2pgsql-cache 500 --all
+              run: ./nominatim import --osm-file ../monaco-latest.osm.pbf
               working-directory: build
 
             - name: Import special phrases
-              run: php ./utils/specialphrases.php --wiki-import | psql -d nominatim
+              run: ./nominatim special-phrases --from-wiki | psql -d nominatim
               working-directory: build
 
             - name: Check import
-              run: php ./utils/check_import_finished.php
+              run: ./nominatim check-database
               working-directory: build
 
             - name: Run update
               run: |
-                   php ./utils/update.php --init-updates
-                   php ./utils/update.php --import-osmosis
+                   ./nominatim replication --init
+                   ./nominatim replication --once
               working-directory: build
 
             - name: Run reverse-only import
               run : |
                   dropdb nominatim
-                  php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --reverse-only --all
+                  php ./nominatim import --osm-file ../monaco-latest.osm.pbf --reverse-only
               working-directory: build