X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/bd04c49bc1b8510e2a037acde5c6023c40728673..83054af46fb21ea40c0bebb2c8a528937e5a49a0:/.github/actions/build-nominatim/action.yml

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index c11b0f77..38deeb96 100644
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -1,25 +1,47 @@
 name: 'Build Nominatim'
 
+inputs:
+    ubuntu:
+        description: 'Version of Ubuntu to install on'
+        required: false
+        default: '20'
+    cmake-args:
+        description: 'Additional options to hand to cmake'
+        required: false
+        default: ''
+
 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 python3-psycopg2 python3-pyosmium
-              shell: bash
-
-            - name: Configure
-              run: mkdir build && cd build && cmake ..
-              shell: bash
-
-            - name: Build
-              run: |
-                  make -j2 all
-                  ./utils/setup.php --setup-website
-              shell: bash
-              working-directory: build
+        - name: Clean out the disk
+          run: |
+            sudo rm -rf /opt/hostedtoolcache/go /opt/hostedtoolcache/CodeQL /usr/lib/jvm /usr/local/share/chromium /usr/local/lib/android
+            df -h
+          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
+            if [ "x$UBUNTUVER" == "x18" ]; then
+                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu osmium PyYAML==5.1 datrie
+            else
+                sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml
+            fi
+            sudo pip3 install -U typing-extensions
+          shell: bash
+          env:
+            UBUNTUVER: ${{ inputs.ubuntu }}
+            CMAKE_ARGS: ${{ inputs.cmake-args }}
 
-            - 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 $CMAKE_ARGS ../Nominatim
+          shell: bash
+          env:
+            CMAKE_ARGS: ${{ inputs.cmake-args }}
 
+        - name: Build
+          run: |
+              make -j2 all
+              sudo make install
+          shell: bash
+          working-directory: build