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 dd97aefa12fb9c24296047296890248832490728..cbb7aa6cc0db52b46959f51a1a4755100dcf7173 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -20,6 +20,12 @@ jobs:
               with:
                   submodules: true
 
               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: |
             - name: Get Date
               id: get-date
               run: |


@@ -29,8 +35,8 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - 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
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql


@@ -72,8 +78,8 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - 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
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql


@@ -84,8 +90,7 @@ jobs:
 
             - name: Create configuration
               run: |
 
             - 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
               working-directory: build
 
             - name: Download import data