Merge remote-tracking branch 'upstream/master'

[nominatim.git] / .github / actions / build-nominatim / action.yml

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index 555d7ee24dde791f961167e266371332bef6f9c2..d62ecf86d1d79c9e9efa77dbc527d814127887a5 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -6,24 +6,24 @@ runs:
     steps:
         - name: Install prerequisits
           run: |
     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 php-symfony-dotenv
+            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 python3-dotenv
+          shell: bash
+
+        - name: Download dependencies
+          run: |
+              if [ ! -f country_grid.sql.gz ]; then
+                  wget --no-verbose https://www.nominatim.org/data/country_grid.sql.gz
+              fi
+              cp country_grid.sql.gz Nominatim/data/country_osm_grid.sql.gz

           shell: bash
 
         - name: Configure
           shell: bash
 
         - name: Configure

-          run: mkdir build && cd build && cmake ..
+          run: mkdir build && cd build && cmake ../Nominatim

           shell: bash
 
         - name: Build
           run: |
               make -j2 all
           shell: bash
 
         - name: Build
           run: |
               make -j2 all

-              ./utils/setup.php --setup-website
+              sudo make install

           shell: bash
           working-directory: build
           shell: bash
           working-directory: build

-
-        - name: Download dependencies
-          run: |
-              if [ ! -f data/country_osm_grid.sql.gz ]; then
-                  wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
-              fi
-          shell: bash
-