add support for starlette framework

[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 a391561636e1478536e5dd080baad0e7faa5ddcd..acc9b8b6e6fd8a902d59b45fff2e2e25b8f87199 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -5,34 +5,43 @@ inputs:
         description: 'Version of Ubuntu to install on'
         required: false
         default: '20'
         description: 'Version of Ubuntu to install on'
         required: false
         default: '20'

+    cmake-args:
+        description: 'Additional options to hand to cmake'
+        required: false
+        default: ''
+    lua:
+        description: 'Version of Lua to use'
+        required: false
+        default: '5.3'

 
 runs:
     using: "composite"
 
     steps:
 
 runs:
     using: "composite"
 
     steps:

+        - 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: |
         - 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
+            sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua${LUA_VERSION}

             if [ "x$UBUNTUVER" == "x18" ]; then
             if [ "x$UBUNTUVER" == "x18" ]; then

-                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu osmium
+                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 datrie

             else
             else

-                sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv
+                sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml

             fi
           shell: bash
           env:
             UBUNTUVER: ${{ inputs.ubuntu }}
             fi
           shell: bash
           env:
             UBUNTUVER: ${{ inputs.ubuntu }}

-
-        - 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
+            CMAKE_ARGS: ${{ inputs.cmake-args }}
+            LUA_VERSION: ${{ inputs.lua }}

 
         - name: Configure
 
         - name: Configure

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

           shell: bash
           shell: bash

+          env:
+            CMAKE_ARGS: ${{ inputs.cmake-args }}

 
         - name: Build
           run: |
 
         - name: Build
           run: |