make installation targets conditional to what is built

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 3daf6ccc49b034ca5ffa01654897e7662de9bbde..1fa7e19d19674f6e35f6d7da68271f0b2109d037 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -35,8 +35,8 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - uses: actions/cache@v2
               with:
                   path: |

-                     {{ github.workspace }}/data/country_osm_grid.sql.gz
-                     {{ github.workspace }}/monaco-latest.osm.pbf
+                     data/country_osm_grid.sql.gz
+                     monaco-latest.osm.pbf

                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql


@@ -46,19 +46,23 @@ jobs:
             - uses: ./.github/actions/build-nominatim
 
             - name: Install test prerequsites
             - uses: ./.github/actions/build-nominatim
 
             - name: Install test prerequsites

-              run: |
-                   sudo apt-get install -y -qq php-codesniffer python3-tidylib
-                   sudo pip3 install behave
+              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 .
 

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

             - name: PHP unit tests
               run: phpunit ./
               working-directory: test/php
 
             - name: PHP unit tests
               run: phpunit ./
               working-directory: test/php
 

+            - name: Python unit tests
+              run: py.test-3 test/python
+

             - name: BDD tests
             - name: BDD tests

-              run: behave -DREMOVE_TEMPLATE=1 --format=progress3 db osm2pgsql
+              run: behave -DREMOVE_TEMPLATE=1 --format=progress3

               working-directory: test/bdd
 
     import:
               working-directory: test/bdd
 
     import:


@@ -78,8 +82,8 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - uses: actions/cache@v2
               with:
                   path: |

-                     {{ github.workspace }}/data/country_osm_grid.sql.gz
-                     {{ github.workspace }}/monaco-latest.osm.pbf
+                     data/country_osm_grid.sql.gz
+                     monaco-latest.osm.pbf

                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql


@@ -88,11 +92,6 @@ jobs:
                   postgis-version: 3
             - uses: ./.github/actions/build-nominatim
 
                   postgis-version: 3
             - uses: ./.github/actions/build-nominatim
 

-            - name: Create configuration
-              run: |
-                   echo "NOMINATIM_PYOSMIUM_BINARY=/usr/lib/python3-pyosmium/pyosmium-get-changes" >> .env
-              working-directory: build
-

             - name: Download import data
               run: |
                   if [ ! -f monaco-latest.osm.pbf ]; then
             - name: Download import data
               run: |
                   if [ ! -f monaco-latest.osm.pbf ]; then


@@ -101,25 +100,28 @@ jobs:
               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: |
+                  mkdir data-env
+                  cd data-env
+                  ../build/nominatim import --osm-file ../monaco-latest.osm.pbf
+              shell: bash

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

-              run: php ./utils/specialphrases.php --wiki-import | psql -d nominatim
-              working-directory: build
+              run: ../build/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: ../build/nominatim 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
+                   ../build/nominatim replication --init
+                   ../build/nominatim replication --once
+              working-directory: data-env

 
             - name: Run reverse-only import
               run : |
 
             - name: Run reverse-only import
               run : |

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