From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 17 Dec 2020 10:53:15 +0000 (+0100)
Subject: github actions: need dotenv
X-Git-Tag: v3.7.0~66^2~6
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/63ad0cb498b9f7597680dd133e781094fed3ee05

github actions: need dotenv
---

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 9bb66df3..555d7ee2 100644
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -5,7 +5,8 @@ runs:
 
     steps:
         - name: Install prerequisits
-          run: sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium
+          run: |
+            sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium php-symfony-dotenv
           shell: bash
 
         - name: Configure
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 1f64df27..cbb7aa6c 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -35,8 +35,8 @@ 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
@@ -78,8 +78,8 @@ 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
@@ -90,8 +90,7 @@ jobs:
 
             - 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