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 38deeb968d385d20d3aac510fa319d89db38a55b..acc9b8b6e6fd8a902d59b45fff2e2e25b8f87199 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -9,6 +9,10 @@ inputs:
         description: 'Additional options to hand to cmake'
         required: false
         default: ''
         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"
 
 runs:
     using: "composite"


@@ -21,17 +25,17 @@ runs:
           shell: bash
         - name: Install prerequisites
           run: |
           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
+            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 PyYAML==5.1 datrie
+                pip3 install python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu==2.9 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
             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 }}
           shell: bash
           env:
             UBUNTUVER: ${{ inputs.ubuntu }}
             CMAKE_ARGS: ${{ inputs.cmake-args }}

+            LUA_VERSION: ${{ inputs.lua }}

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