Merge remote-tracking branch 'upstream/master'

[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 acc9b8b6e6fd8a902d59b45fff2e2e25b8f87199..d601fc7b7880534eec5934e4bb0e7ab57a2c03c1 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -1,10 +1,10 @@
 name: 'Build Nominatim'
 
 inputs:
-    ubuntu:
+    flavour:
         description: 'Version of Ubuntu to install on'
         required: false
-        default: '20'
+        default: 'ubuntu-20'
     cmake-args:
         description: 'Additional options to hand to cmake'
         required: false
@@ -23,17 +23,18 @@ runs:
             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
+        - name: Install${{ matrix.flavour }} 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 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==2.9 osmium PyYAML==5.1 datrie
+            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} lua-dkjson nlohmann-json3-dev libspatialite7 libsqlite3-mod-spatialite
+            if [ "$FLAVOUR" == "oldstuff" ]; then
+                pip3 install MarkupSafe==2.0.1 python-dotenv jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4.31 psycopg==3.1.7 datrie asyncpg aiosqlite
             else
-                sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml
+                sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-dotenv python3-yaml
+                pip3 install sqlalchemy psycopg aiosqlite
             fi
           shell: bash
           env:
-            UBUNTUVER: ${{ inputs.ubuntu }}
+            FLAVOUR: ${{ inputs.flavour }}
             CMAKE_ARGS: ${{ inputs.cmake-args }}
             LUA_VERSION: ${{ inputs.lua }}