Skip to content

Commit 5300472

Browse files
authored
Merge pull request #346 from pgpointcloud/postgis_pg16
Try to activate PostGIS 3 support with PostgreSQL 16
2 parents d09d45f + 076e54b commit 5300472

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

.github/scripts/postgresql_postgis.sh

+1-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,7 @@
33
set -e
44

55
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
6-
7-
if [[ $POSTGRESQL_VERSION == *12* ]];
8-
then
9-
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
10-
echo "Using main repo"
11-
else
12-
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
13-
echo "Using snapshot report for$POSTGRESQL_VERSION"
14-
fi
6+
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
157

168
# RAISE priority of pgdg
179
cat << EOF >> ./pgdg.pref

.github/workflows/jammy_postgres16.yml .github/workflows/jammy_postgres16_postgis33.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "[ubuntu-22.04] PostgreSQL 16"
1+
name: "[ubuntu-22.04] PostgreSQL 16 and PostGIS 3.3"
22

33
on:
44
push:
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install PostgreSQL
1818
env:
1919
POSTGRESQL_VERSION: 16
20-
# POSTGIS_VERSION: 3
20+
POSTGIS_VERSION: 3
2121
run: .github/scripts/postgresql_postgis.sh
2222
- name: Install and check PgPointCloud
2323
run: .github/scripts/pgpointcloud.sh

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ https://pgpointcloud.github.io/pointcloud/ for more information.
1616
| 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) |
1717
| 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) |
1818
| 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) |
19-
| 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) |
19+
| 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) |

doc/development.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ and with various PostgreSQL/PostGIS releases:
155155
| | | | |
156156
| | | |15_33_jammy| | |15_33_jammy| |
157157
+--------------------+-----------------------+------------------------+------------------------+
158-
| PostgreSQL 16 | | | |16_jammy| |
158+
| PostgreSQL 16 | | |16_33_jammy| | |16_33_jammy| |
159159
+--------------------+-----------------------+------------------------+------------------------+
160160

161161
.. |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:
176176

177177
.. |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
178178

179-
.. |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
179+
.. |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
180180

181181
.. _`source`: https://github.com/hobu/laz-perf
182182
.. _`DockerHub`: https://hub.docker.com/_/postgres

0 commit comments

Comments
 (0)