Merge pull request #2381 from lonvia/reorganise-abbreviations

[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 191ef2ee3f8af8c13519cb315bd83a6f47cf13c8..a391561636e1478536e5dd080baad0e7faa5ddcd 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -1,13 +1,26 @@
 name: 'Build Nominatim'
 
 name: 'Build Nominatim'
 

+inputs:
+    ubuntu:
+        description: 'Version of Ubuntu to install on'
+        required: false
+        default: '20'
+

 runs:
     using: "composite"
 
     steps:
         - name: Install prerequisites
           run: |
 runs:
     using: "composite"
 
     steps:
         - 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 python3-psycopg2 python3-pyosmium python3-dotenv python3-psutil python3-jinja2 python3-icu python3-argparse-manpage
+            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
+            else
+                sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv
+            fi

           shell: bash
           shell: bash

+          env:
+            UBUNTUVER: ${{ inputs.ubuntu }}

 
         - name: Download dependencies
           run: |
 
         - name: Download dependencies
           run: |