Merge pull request #346 from pgpointcloud/postgis_pg16

Try to activate PostGIS 3 support with PostgreSQL 16
pgpointcloud · Sep 19, 2023 · 5300472 · 5300472
2 parents d09d45f + 076e54b
commit 5300472
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git 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 → .../workflows/jammy_postgres16_postgis33.yml b/.github/workflows/jammy_postgres16.yml → .../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

diff --git a/README.md b/README.md
@@ -16,4 +16,4 @@ https://pgpointcloud.github.io/pointcloud/ for more information.
 | PostgreSQL 13      |               | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres13_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)<br />![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres13_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres13_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)<br />![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres13_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) |
 | PostgreSQL 14      |               | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres14_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)<br />![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres14_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres14_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)<br />![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres14_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) |
 | PostgreSQL 15      |               | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres15_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)<br />![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres15_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres15_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)<br />![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres15_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) |
-| PostgreSQL 16      |               |               | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres16.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) |
+| PostgreSQL 16      |               | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres16_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres16_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) |
diff --git a/doc/development.rst b/doc/development.rst
@@ -155,7 +155,7 @@ and with various PostgreSQL/PostGIS releases:
 |                    |                       |                        |                        |
 |                    |                       | |15_33_jammy|          | |15_33_jammy|          |
 +--------------------+-----------------------+------------------------+------------------------+
-| PostgreSQL 16      |                       |                        | |16_jammy|             |
+| PostgreSQL 16      |                       | |16_33_jammy|          | |16_33_jammy|          |
 +--------------------+-----------------------+------------------------+------------------------+
 
 .. |12_25_focal| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres12_postgis25.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-20.04%5D+PostgreSQL+12+and+PostGIS+2.5%22
@@ -176,7 +176,7 @@ and with various PostgreSQL/PostGIS releases:
 
 .. |15_33_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres15_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-22.04%5D+PostgreSQL+15+and+PostGIS+3.3%22
 
-.. |16_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres16.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-22.04%5D+PostgreSQL+16%22
+.. |16_33_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres16_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-22.04%5D+PostgreSQL+16+and+PostGIS+3.3%22
 
 .. _`source`: https://github.com/hobu/laz-perf
 .. _`DockerHub`: https://hub.docker.com/_/postgres