X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/5e477e3b5b99da6fc4e54749d4671a6fc8fdcd66..1adb0a9886b298fe351f181d6da413e5c261c9f7:/.github/actions/build-nominatim/action.yml?ds=inline diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml index c6ff7a31..acc9b8b6 100644 --- 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: '' + lua: + description: 'Version of Lua to use' + required: false + default: '5.3' runs: using: "composite" @@ -21,9 +25,9 @@ runs: 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 - 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 @@ -31,6 +35,7 @@ runs: env: UBUNTUVER: ${{ inputs.ubuntu }} CMAKE_ARGS: ${{ inputs.cmake-args }} + LUA_VERSION: ${{ inputs.lua }} - name: Configure run: mkdir build && cd build && cmake $CMAKE_ARGS ../Nominatim