Code cleaning, tests simplification and use of python3-icu package

[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 44c19a22d2c3de8649a9b5901e488a217b5fd432..d0a89774637eb9238de77f767daa4451d047e34b 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -4,22 +4,26 @@ runs:
     using: "composite"
 
     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 postgresql-13-postgis-3 postgresql-13-postgis-3-scripts postgresql-server-dev-13 python3-psycopg2 python3-pyosmium
-              shell: bash
+        - name: Install prerequisites
+          run: |
+            sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev python3-psycopg2 python3-pyosmium python3-dotenv python3-psutil python3-jinja2 python3-icu
+          shell: bash
 
-            - name: Configure
-              run: mkdir build && cd build && cmake ..
-              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: Build
-              run: |
-                  make -j2 all
-                  ./utils/setup.php --setup-website
-              shell: bash
-              working-directory: build
-
-            - name: Download dependencies
-              run: wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
-              shell: bash
+        - name: Configure
+          run: mkdir build && cd build && cmake ../Nominatim
+          shell: bash
 
+        - name: Build
+          run: |
+              make -j2 all
+              sudo make install
+          shell: bash
+          working-directory: build