From 5e8d11b3800e625333bb6b8b4e74d4bb1b244177 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Fri, 25 Aug 2023 01:34:30 +0200 Subject: [PATCH] Add PG16 CI badges in README and doc --- ...es16_postgis3.yml => jammy_postgres16.yml} | 6 +-- README.md | 13 +++--- doc/development.rst | 44 ++++++++++--------- 3 files changed, 34 insertions(+), 29 deletions(-) rename .github/workflows/{jammy_postgres16_postgis3.yml => jammy_postgres16.yml} (82%) diff --git a/.github/workflows/jammy_postgres16_postgis3.yml b/.github/workflows/jammy_postgres16.yml similarity index 82% rename from .github/workflows/jammy_postgres16_postgis3.yml rename to .github/workflows/jammy_postgres16.yml index 19a1ad96..134e6718 100644 --- a/.github/workflows/jammy_postgres16_postgis3.yml +++ b/.github/workflows/jammy_postgres16.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-22.04] PostgreSQL 16 and PostGIS 3" +name: "[ubuntu-22.04] PostgreSQL 16" on: push: @@ -14,10 +14,10 @@ jobs: steps: - name: Check out repository code uses: actions/checkout@v2 - - name: Install PostgreSQL and PostGIS + - 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 index 384f675e..a9d6c9b1 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,10 @@ https://pgpointcloud.github.io/pointcloud/ for more information. ## Continuous integration -| | PostGIS 2.5 | PostGIS 3.3 | -| ------------------ |:-------------:|:-----------:| -| PostgreSQL 12 | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres12_postgis25.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic) | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres12_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)
![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres12_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | -| 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)
![](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)
![](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)
![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres15_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | +| | PostGIS 2.5 | PostGIS 3.3 | W/O PostGIS | +| ------------------ |:-------------:|:-----------:|:-----------:| +| PostgreSQL 12 | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres12_postgis25.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic) | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres12_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)
![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres12_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | ![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres12_postgis33.yml?branch=master&label=Ubuntu%2020.04&logo=github&style=plastic)
![](https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres12_postgis33.yml?branch=master&label=Ubuntu%2022.04&logo=github&style=plastic) | +| 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)
![](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)
![](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)
![](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)
![](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)
![](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)
![](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 | diff --git a/doc/development.rst b/doc/development.rst index 8e22089e..fc740a9f 100644 --- a/doc/development.rst +++ b/doc/development.rst @@ -136,25 +136,27 @@ Continuous Integration pgPointcloud tests are run with `Github Actions`_ on several Ubuntu versions and with various PostgreSQL/PostGIS releases: -+--------------------+-----------------------+------------------------+ -| | PostGIS 2.5 | PostGIS 3.3 | -+--------------------+-----------------------+------------------------+ -| PostgreSQL 12 | |12_25_focal| | |12_33_focal| | -| | | | -| | | |12_33_jammy| | -+--------------------+-----------------------+------------------------+ -| PostgreSQL 13 | | |13_33_focal| | -| | | | -| | | |13_33_jammy| | -+--------------------+-----------------------+------------------------+ -| PostgreSQL 14 | | |14_33_focal| | -| | | | -| | | |14_33_jammy| | -+--------------------+-----------------------+------------------------+ -| PostgreSQL 15 | | |15_33_focal| | -| | | | -| | | |15_33_jammy| | -+--------------------+-----------------------+------------------------+ ++--------------------+-----------------------+------------------------+------------------------+ +| | PostGIS 2.5 | PostGIS 3.3 | W/O PostGIS | ++--------------------+-----------------------+------------------------+------------------------+ +| PostgreSQL 12 | |12_25_focal| | |12_33_focal| | |12_33_focal| | +| | | | | +| | | |12_33_jammy| | |12_33_jammy| | ++--------------------+-----------------------+------------------------+------------------------+ +| PostgreSQL 13 | | |13_33_focal| | |13_33_focal| | +| | | | | +| | | |13_33_jammy| | |13_33_jammy| | ++--------------------+-----------------------+------------------------+------------------------+ +| PostgreSQL 14 | | |14_33_focal| | |14_33_focal| | +| | | | | +| | | |14_33_jammy| | |14_33_jammy| | ++--------------------+-----------------------+------------------------+------------------------+ +| PostgreSQL 15 | | |15_33_focal| | |15_33_focal| | +| | | | | +| | | |15_33_jammy| | |15_33_jammy| | ++--------------------+-----------------------+------------------------+------------------------+ +| PostgreSQL 16 | | | |16_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 @@ -174,6 +176,8 @@ 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 + .. _`source`: https://github.com/hobu/laz-perf .. _`DockerHub`: https://hub.docker.com/_/postgres .. _`GitHub Actions`: https://github.com/pgpointcloud/pointcloud/actions @@ -200,7 +204,7 @@ Steps for releasing a new version of Pointcloud: 5. When the PR is merged create a tag for the new release and push it to GitHub: -.. code-block:: bash +.. code-block:: console $ git tag -a vx.y.z -m 'version x.y.z' $ git push origin vx.y.z