Merge remote-tracking branch 'upstream/master'

[nominatim.git] / .github / actions / setup-postgresql / action.yml

diff --git a/.github/actions/setup-postgresql/action.yml b/.github/actions/setup-postgresql/action.yml
index 416ced5fb4373b8b7cd2123a52dc70a0f317617b..331d094a0a57fd24ddf4e209c1e1ba731de2621f 100644 (file)
--- a/.github/actions/setup-postgresql/action.yml
+++ b/.github/actions/setup-postgresql/action.yml
@@ -4,9 +4,6 @@ inputs:
     postgresql-version:
         description: 'Version of PostgreSQL to install'
         required: true
     postgresql-version:
         description: 'Version of PostgreSQL to install'
         required: true

-    postgis-version:
-        description: 'Version of Postgis to install'
-        required: true

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


@@ -24,11 +21,10 @@ runs:
 
         - name: Install PostgreSQL
           run: |
 
         - name: Install PostgreSQL
           run: |

-              sudo apt-get install -y -qq --no-install-suggests --no-install-recommends postgresql-client-${PGVER} postgresql-${PGVER}-postgis-${POSTGISVER} postgresql-${PGVER}-postgis-${POSTGISVER}-scripts postgresql-contrib-${PGVER} postgresql-${PGVER}
+              sudo apt-get install -y -qq --no-install-suggests --no-install-recommends postgresql-client-${PGVER} postgresql-${PGVER}-postgis-3 postgresql-${PGVER}-postgis-3-scripts postgresql-contrib-${PGVER} postgresql-${PGVER}

           shell: bash
           env:
               PGVER: ${{ inputs.postgresql-version }}
           shell: bash
           env:
               PGVER: ${{ inputs.postgresql-version }}

-              POSTGISVER: ${{ inputs.postgis-version }}

 
         - name: Adapt postgresql configuration
           run: |
 
         - name: Adapt postgresql configuration
           run: |