From 0710a1bc1bdda78f625334fe33e4dc149e54c8b7 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Tue, 19 Sep 2023 14:33:19 +0200 Subject: [PATCH] Try to activate PostGIS 3 support with PostgreSQL 16 --- .github/scripts/postgresql_postgis.sh | 10 +--------- ...y_postgres16.yml => jammy_postgres16_postgis33.yml} | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) rename .github/workflows/{jammy_postgres16.yml => jammy_postgres16_postgis33.yml} (88%) diff --git a/.github/scripts/postgresql_postgis.sh b/.github/scripts/postgresql_postgis.sh index da20a29b..27a4ce24 100755 --- a/.github/scripts/postgresql_postgis.sh +++ b/.github/scripts/postgresql_postgis.sh @@ -3,15 +3,7 @@ set -e curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null - -if [[ $POSTGRESQL_VERSION == *12* ]]; -then - echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main $POSTGRESQL_VERSION" |sudo tee /etc/apt/sources.list.d/pgdg.list - echo "Using main repo" -else - echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg-snapshot main $POSTGRESQL_VERSION" |sudo tee /etc/apt/sources.list.d/pgdg.list - echo "Using snapshot report for$POSTGRESQL_VERSION" -fi +echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main $POSTGRESQL_VERSION" |sudo tee /etc/apt/sources.list.d/pgdg.list # RAISE priority of pgdg cat << EOF >> ./pgdg.pref diff --git a/.github/workflows/jammy_postgres16.yml b/.github/workflows/jammy_postgres16_postgis33.yml similarity index 88% rename from .github/workflows/jammy_postgres16.yml rename to .github/workflows/jammy_postgres16_postgis33.yml index 134e6718..ff7eb34f 100644 --- a/.github/workflows/jammy_postgres16.yml +++ b/.github/workflows/jammy_postgres16_postgis33.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-22.04] PostgreSQL 16" +name: "[ubuntu-22.04] PostgreSQL 16 and PostGIS 3.3" on: push: @@ -17,7 +17,7 @@ jobs: - name: Install PostgreSQL env: POSTGRESQL_VERSION: 16 - # POSTGIS_VERSION: 3 + POSTGIS_VERSION: 3 run: .github/scripts/postgresql_postgis.sh - name: Install and check PgPointCloud run: .github/scripts/pgpointcloud.sh