From 03c1fce7063e5b6b67ba1700274ec234da08b4a0 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Sat, 3 May 2025 18:55:40 +0200 Subject: [PATCH 1/6] Add pipeline for PostgreSQL 13 and PostGIS 3.3 on Ubuntu 24.04 --- .../workflows/noble_postgres13_postgis33.yml | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/noble_postgres13_postgis33.yml diff --git a/.github/workflows/noble_postgres13_postgis33.yml b/.github/workflows/noble_postgres13_postgis33.yml new file mode 100644 index 00000000..75879930 --- /dev/null +++ b/.github/workflows/noble_postgres13_postgis33.yml @@ -0,0 +1,27 @@ +name: "[ubuntu-24.04] PostgreSQL 13 and PostGIS 3.3" + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + name: Building and testing + runs-on: ubuntu-24.04 + steps: + - name: Check out repository code + uses: actions/checkout@v2 + - name: Install PostgreSQL and PostGIS + env: + POSTGRESQL_VERSION: 13 + POSTGIS_VERSION: 3 + run: .github/scripts/postgresql_postgis.sh + - name: Install and check PgPointCloud + run: .github/scripts/pgpointcloud.sh + - name: Error + if: ${{ failure() }} + run: cat pgsql/regression.diffs + - name: Dump and restore tests + run: .github/scripts/test_dump_restore.sh From 5e093f4c3e324cbada297acb19a94e4154828cff Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Sat, 3 May 2025 19:05:25 +0200 Subject: [PATCH 2/6] Add pipelines for PostgreSQL 14, 15, 16 on Ubuntu 24.04 --- .../workflows/jammy_postgres13_postgis33.yml | 2 +- .../workflows/jammy_postgres14_postgis33.yml | 2 +- .../workflows/jammy_postgres15_postgis33.yml | 2 +- .../workflows/noble_postgres14_postgis33.yml | 27 ++++++++++++++++++ .../workflows/noble_postgres15_postgis33.yml | 27 ++++++++++++++++++ .../workflows/noble_postgres16_postgis33.yml | 28 +++++++++++++++++++ 6 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/noble_postgres14_postgis33.yml create mode 100644 .github/workflows/noble_postgres15_postgis33.yml create mode 100644 .github/workflows/noble_postgres16_postgis33.yml diff --git a/.github/workflows/jammy_postgres13_postgis33.yml b/.github/workflows/jammy_postgres13_postgis33.yml index 0a5c0e57..c94357c7 100644 --- a/.github/workflows/jammy_postgres13_postgis33.yml +++ b/.github/workflows/jammy_postgres13_postgis33.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-22.04] PostgreSQL 12 and PostGIS 3.3" +name: "[ubuntu-22.04] PostgreSQL 13 and PostGIS 3.3" on: push: diff --git a/.github/workflows/jammy_postgres14_postgis33.yml b/.github/workflows/jammy_postgres14_postgis33.yml index d33edae1..c668d018 100644 --- a/.github/workflows/jammy_postgres14_postgis33.yml +++ b/.github/workflows/jammy_postgres14_postgis33.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-22.04] PostgreSQL 12 and PostGIS 3.3" +name: "[ubuntu-22.04] PostgreSQL 14 and PostGIS 3.3" on: push: diff --git a/.github/workflows/jammy_postgres15_postgis33.yml b/.github/workflows/jammy_postgres15_postgis33.yml index 26b5fc99..74f27836 100644 --- a/.github/workflows/jammy_postgres15_postgis33.yml +++ b/.github/workflows/jammy_postgres15_postgis33.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-22.04] PostgreSQL 12 and PostGIS 3.3" +name: "[ubuntu-22.04] PostgreSQL 15 and PostGIS 3.3" on: push: diff --git a/.github/workflows/noble_postgres14_postgis33.yml b/.github/workflows/noble_postgres14_postgis33.yml new file mode 100644 index 00000000..66194ff1 --- /dev/null +++ b/.github/workflows/noble_postgres14_postgis33.yml @@ -0,0 +1,27 @@ +name: "[ubuntu-24.04] PostgreSQL 14 and PostGIS 3.3" + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + name: Building and testing + runs-on: ubuntu-24.04 + steps: + - name: Check out repository code + uses: actions/checkout@v2 + - name: Install PostgreSQL and PostGIS + env: + POSTGRESQL_VERSION: 14 + POSTGIS_VERSION: 3 + run: .github/scripts/postgresql_postgis.sh + - name: Install and check PgPointCloud + run: .github/scripts/pgpointcloud.sh + - name: Error + if: ${{ failure() }} + run: cat pgsql/regression.diffs + - name: Dump and restore tests + run: .github/scripts/test_dump_restore.sh diff --git a/.github/workflows/noble_postgres15_postgis33.yml b/.github/workflows/noble_postgres15_postgis33.yml new file mode 100644 index 00000000..72355332 --- /dev/null +++ b/.github/workflows/noble_postgres15_postgis33.yml @@ -0,0 +1,27 @@ +name: "[ubuntu-24.04] PostgreSQL 15 and PostGIS 3.3" + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + name: Building and testing + runs-on: ubuntu-24.04 + steps: + - name: Check out repository code + uses: actions/checkout@v2 + - name: Install PostgreSQL and PostGIS + env: + POSTGRESQL_VERSION: 15 + POSTGIS_VERSION: 3 + run: .github/scripts/postgresql_postgis.sh + - name: Install and check PgPointCloud + run: .github/scripts/pgpointcloud.sh + - name: Error + if: ${{ failure() }} + run: cat pgsql/regression.diffs + - name: Dump and restore tests + run: .github/scripts/test_dump_restore.sh diff --git a/.github/workflows/noble_postgres16_postgis33.yml b/.github/workflows/noble_postgres16_postgis33.yml new file mode 100644 index 00000000..9109d3b7 --- /dev/null +++ b/.github/workflows/noble_postgres16_postgis33.yml @@ -0,0 +1,28 @@ +name: "[ubuntu-24.04] PostgreSQL 16 and PostGIS 3.3" + +on: + push: + branches: + - master + + pull_request: + +jobs: + build: + name: Building and testing + runs-on: ubuntu-24.04 + steps: + - name: Check out repository code + uses: actions/checkout@v2 + - name: Install PostgreSQL + env: + POSTGRESQL_VERSION: 16 + POSTGIS_VERSION: 3 + run: .github/scripts/postgresql_postgis.sh + - name: Install and check PgPointCloud + run: .github/scripts/pgpointcloud.sh + - name: Error + if: ${{ failure() }} + run: cat pgsql/regression.diffs + - name: Dump and restore tests + run: .github/scripts/test_dump_restore.sh From 9865a8ca0b2c91407cc5de5cfb50e405319ba96e Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Sat, 3 May 2025 22:06:16 +0200 Subject: [PATCH 3/6] Update README --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 79163f83..3f23e7b9 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ -# Pointcloud # +# Pointcloud [![Release][release-image]][releases] [release-image]: https://img.shields.io/badge/release-1.2.5-green.svg?style=plastic -[releases]: https://github.com/pgpointcloud/pointcloud/releases +[releases]: https://ubuntu.com/pgpointcloud/pointcloud/releases A PostgreSQL extension for storing point cloud (LIDAR) data. See -https://pgpointcloud.github.io/pointcloud/ for more information. +https://pgpointcloud.ubuntu.io/pointcloud/ for more information. ## Continuous integration -| | PostGIS 3.3 | W/O PostGIS | +| | w/o PostGIS | PostGIS 3.3 | | ------------------ |:-----------:|:-----------:| -| PostgreSQL 13 | ![](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/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/jammy_postgres14_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | ![](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/jammy_postgres15_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | ![](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_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) | +| PostgreSQL 13 | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres13_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres13_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres13_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres13_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | +| PostgreSQL 14 | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres14_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres14_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres14_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres14_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | +| PostgreSQL 15 | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres15_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres15_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres15_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres15_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | +| PostgreSQL 16 | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres16_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres16_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | ![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres16_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu)
![](https://img.shields.io/ubuntu/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres16_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu) | From 53361e5ef8761ed89a249819ee8c4a99fd78b41e Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Sat, 3 May 2025 22:06:32 +0200 Subject: [PATCH 4/6] Fix pipeline label --- .github/workflows/jammy_postgres16_postgis33.yml | 2 +- .github/workflows/noble_postgres16_postgis33.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jammy_postgres16_postgis33.yml b/.github/workflows/jammy_postgres16_postgis33.yml index ff7eb34f..c69e91f5 100644 --- a/.github/workflows/jammy_postgres16_postgis33.yml +++ b/.github/workflows/jammy_postgres16_postgis33.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Check out repository code uses: actions/checkout@v2 - - name: Install PostgreSQL + - name: Install PostgreSQL and PostGIS env: POSTGRESQL_VERSION: 16 POSTGIS_VERSION: 3 diff --git a/.github/workflows/noble_postgres16_postgis33.yml b/.github/workflows/noble_postgres16_postgis33.yml index 9109d3b7..8ac640fb 100644 --- a/.github/workflows/noble_postgres16_postgis33.yml +++ b/.github/workflows/noble_postgres16_postgis33.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Check out repository code uses: actions/checkout@v2 - - name: Install PostgreSQL + - name: Install PostgreSQL and PostGIS env: POSTGRESQL_VERSION: 16 POSTGIS_VERSION: 3 From 880fec1bf40abb2103ddd1867f638f5065a6d3dd Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Sat, 3 May 2025 22:07:47 +0200 Subject: [PATCH 5/6] Remove unnecessary file --- .editorconfig | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 704c86b2..00000000 --- a/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -# EditorConfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# tab indentation -[**.{sql.in,sql}] -indent_style = tab -indent_size = 4 -end_of_line = lf -insert_final_newline = true -charset = utf-8 -trim_trailing_whitespace = true From 65c97add06b9920a60a1576648589ab85177e50c Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Sat, 3 May 2025 22:16:42 +0200 Subject: [PATCH 6/6] Update CI chapter in developer doc --- doc/development.rst | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/doc/development.rst b/doc/development.rst index d2b102e5..21245abb 100644 --- a/doc/development.rst +++ b/doc/development.rst @@ -137,24 +137,40 @@ pgPointcloud tests are run with `Github Actions`_ on several Ubuntu versions and with various PostgreSQL/PostGIS releases: +--------------------+-----------------------+-------------------------+ -| | PostGIS 3.3 | W/O PostGIS | -+--------------------+------------------------+------------------------+ -| PostgreSQL 13 | |13_33_jammy| | |13_33_jammy| | -+--------------------+------------------------+------------------------+ -| PostgreSQL 14 | |14_33_jammy| | |14_33_jammy| | -+--------------------+------------------------+------------------------+ -| PostgreSQL 15 | |15_33_jammy| | |15_33_jammy| | -+--------------------+------------------------+------------------------+ -| PostgreSQL 16 | |16_33_jammy| | |16_33_jammy| | +| | w/o PostGIS | PostGIS 3.3 | +--------------------+-----------------------+-------------------------+ +| PostgreSQL 13 | |13_33_jammy| | |13_33_jammy| | +| | | | +| | |13_33_noble| | |13_33_noble| | ++--------------------+-----------------------+-------------------------+ +| PostgreSQL 14 | |14_33_jammy| | |14_33_jammy| | +| | | | +| | |14_33_noble| | |14_33_noble| | ++--------------------+-----------------------+-------------------------+ +| PostgreSQL 15 | |15_33_jammy| | |15_33_jammy| | +| | | | +| | |15_33_noble| | |15_33_noble| | ++--------------------+-----------------------+-------------------------+ +| PostgreSQL 16 | |16_33_jammy| | |16_33_jammy| | +| | | | +| | |16_33_noble| | |16_33_noble| | ++--------------------+-----------------------+-------------------------+ + +.. |13_33_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres13_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-22.04%5D+PostgreSQL+13+and+PostGIS+3.3%22 + +.. |14_33_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres14_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-22.04%5D+PostgreSQL+14+and+PostGIS+3.3%22 + +.. |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=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-22.04%5D+PostgreSQL+15+and+PostGIS+3.3%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=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-22.04%5D+PostgreSQL+16+and+PostGIS+3.3%22 -.. |13_33_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres13_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+13+and+PostGIS+3.3%22 +.. |13_33_noble| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres13_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-24.04%5D+PostgreSQL+13+and+PostGIS+3.3%22 -.. |14_33_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres14_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+14+and+PostGIS+3.3%22 +.. |14_33_noble| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres14_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-24.04%5D+PostgreSQL+14+and+PostGIS+3.3%22 -.. |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 +.. |15_33_noble| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres15_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-24.04%5D+PostgreSQL+15+and+PostGIS+3.3%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 +.. |16_33_noble| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/noble_postgres16_postgis33.yml?branch=master&label=Ubuntu%2024.04&logo=ubuntu :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-24.04%5D+PostgreSQL+16+and+PostGIS+3.3%22 .. _`source`: https://github.com/hobu/laz-perf .. _`DockerHub`: https://hub.docker.com/_/postgres