From 199810740278790cf959186d9adf21c46aae6486 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Mon, 7 Feb 2022 21:58:04 +0100 Subject: [PATCH 1/7] Add CI for Postgresql 12 / Postgis 3 on Ubuntu 20.04 --- .../workflows/focal_postgres12_postgis3.yml | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/focal_postgres12_postgis3.yml diff --git a/.github/workflows/focal_postgres12_postgis3.yml b/.github/workflows/focal_postgres12_postgis3.yml new file mode 100644 index 0000000..3ebe1ef --- /dev/null +++ b/.github/workflows/focal_postgres12_postgis3.yml @@ -0,0 +1,28 @@ +name: "[ubuntu-18.04] PostgreSQL 12 and PostGIS 3" + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + name: Building and testing + runs-on: ubuntu-20.04 + steps: + - name: Check out repository code + uses: actions/checkout@v2 + - name: Install PostgreSQL and PostGIS + env: + POSTGRESQL_VERSION: 12 + POSTGIS_VERSION: 3 + run: .github/scripts/postgresql_postgis.sh + - name: Install and check PgPointCloud + env: + POSTGRESQL_VERSION: 12 + POSTGIS_VERSION: 3 + run: .github/scripts/pgpointcloud.sh + - name: Error + if: ${{ failure() }} + run: cat pgsql/regression.diffs From 3aabf46cab52cd8627b540c9a1e3364808a1adb1 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Mon, 7 Feb 2022 22:01:37 +0100 Subject: [PATCH 2/7] Fix name --- .github/workflows/focal_postgres12_postgis3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/focal_postgres12_postgis3.yml b/.github/workflows/focal_postgres12_postgis3.yml index 3ebe1ef..1302941 100644 --- a/.github/workflows/focal_postgres12_postgis3.yml +++ b/.github/workflows/focal_postgres12_postgis3.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-18.04] PostgreSQL 12 and PostGIS 3" +name: "[ubuntu-20.04] PostgreSQL 12 and PostGIS 3" on: push: From 479dbf553e68cb1d30a14ec6b237342e6e01ae5c Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Mon, 7 Feb 2022 22:06:44 +0100 Subject: [PATCH 3/7] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d48a332..5fb8d78 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ https://pgpointcloud.github.io/pointcloud/ for more information. | | PostGIS 2.5 | PostGIS 3 | | -------------- |:-------------:|:---------:| -| PostgreSQL 12 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic) | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic) | +| PostgreSQL 12 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic) | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic) ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2020.04&logo=github&style=plastic) | From f05d4a2c069efecb66f92f54dcbac9c987c0a85b Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Mon, 7 Feb 2022 22:09:31 +0100 Subject: [PATCH 4/7] New line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5fb8d78..17e1be0 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,4 @@ https://pgpointcloud.github.io/pointcloud/ for more information. | | PostGIS 2.5 | PostGIS 3 | | -------------- |:-------------:|:---------:| -| PostgreSQL 12 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic) | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic) ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2020.04&logo=github&style=plastic) | +| PostgreSQL 12 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic) | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic)
![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2020.04&logo=github&style=plastic) | From 780951b30d8836fb9ecfe32a65e709476cd05537 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Mon, 7 Feb 2022 22:27:50 +0100 Subject: [PATCH 5/7] Update rst doc --- doc/development.rst | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/doc/development.rst b/doc/development.rst index ae4f38b..e7444cd 100644 --- a/doc/development.rst +++ b/doc/development.rst @@ -135,15 +135,18 @@ Continuous Integration pgPointcloud tests are run with `Github Actions`_ on several Ubuntu versions and with various PostgreSQL/PostGIS releases: -+---------------+----------------+-----------------+ -| | PostGIS 2.5 | PostGIS 3 | -+---------------+----------------+-----------------+ -| PostgreSQL 12 | |12_25| | |12_3| | -+---------------+----------------+-----------------+ ++---------------+-----------------------+------------------------+ +| | PostGIS 2.5 | PostGIS 3 | ++---------------+-----------------------+------------------------+ +| PostgreSQL 12 | |12_25_bionic| | - |12_3_bionic| | +| | | - |12_3_focal| | ++---------------+-----------------------+------------------------+ -.. |12_25| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-18.04%5D+PostgreSQL+12+and+PostGIS+2.5%22 +.. |12_25_bionic| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-18.04%5D+PostgreSQL+12+and+PostGIS+2.5%22 -.. |12_3| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-18.04%5D+PostgreSQL+12+and+PostGIS+3%22 +.. |12_3_bionic| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-18.04%5D+PostgreSQL+12+and+PostGIS+3%22 + +.. |12_3_focal| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?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+3%22 .. _`source`: https://github.com/hobu/laz-perf .. _`DockerHub`: https://hub.docker.com/_/postgres From 8ec1cb903e817a36cd2848105fab2301380aa707 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Tue, 8 Feb 2022 08:51:35 +0100 Subject: [PATCH 6/7] Explicit use of PostGIS 3.2 --- ...12_postgis3.yml => bionic_postgres12_postgis32.yml} | 2 +- ...s12_postgis3.yml => focal_postgres12_postgis32.yml} | 2 +- README.md | 6 +++--- doc/development.rst | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) rename .github/workflows/{bionic_postgres12_postgis3.yml => bionic_postgres12_postgis32.yml} (92%) rename .github/workflows/{focal_postgres12_postgis3.yml => focal_postgres12_postgis32.yml} (92%) diff --git a/.github/workflows/bionic_postgres12_postgis3.yml b/.github/workflows/bionic_postgres12_postgis32.yml similarity index 92% rename from .github/workflows/bionic_postgres12_postgis3.yml rename to .github/workflows/bionic_postgres12_postgis32.yml index 77d2bf8..fe2803a 100644 --- a/.github/workflows/bionic_postgres12_postgis3.yml +++ b/.github/workflows/bionic_postgres12_postgis32.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-18.04] PostgreSQL 12 and PostGIS 3" +name: "[ubuntu-18.04] PostgreSQL 12 and PostGIS 3.2" on: push: diff --git a/.github/workflows/focal_postgres12_postgis3.yml b/.github/workflows/focal_postgres12_postgis32.yml similarity index 92% rename from .github/workflows/focal_postgres12_postgis3.yml rename to .github/workflows/focal_postgres12_postgis32.yml index 1302941..3ec7297 100644 --- a/.github/workflows/focal_postgres12_postgis3.yml +++ b/.github/workflows/focal_postgres12_postgis32.yml @@ -1,4 +1,4 @@ -name: "[ubuntu-20.04] PostgreSQL 12 and PostGIS 3" +name: "[ubuntu-20.04] PostgreSQL 12 and PostGIS 3.2" on: push: diff --git a/README.md b/README.md index 17e1be0..ea66ed1 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,6 @@ https://pgpointcloud.github.io/pointcloud/ for more information. ## Continuous integration -| | PostGIS 2.5 | PostGIS 3 | -| -------------- |:-------------:|:---------:| -| PostgreSQL 12 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic) | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic)
![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2020.04&logo=github&style=plastic) | +| | PostGIS 2.5 | PostGIS 3.2 | +| -------------- |:-------------:|:-----------:| +| PostgreSQL 12 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic) | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203.2?label=Ubuntu%2018.04&logo=github&style=plastic)
![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203.2?label=Ubuntu%2020.04&logo=github&style=plastic) | diff --git a/doc/development.rst b/doc/development.rst index e7444cd..ea145ae 100644 --- a/doc/development.rst +++ b/doc/development.rst @@ -136,17 +136,17 @@ pgPointcloud tests are run with `Github Actions`_ on several Ubuntu versions and with various PostgreSQL/PostGIS releases: +---------------+-----------------------+------------------------+ -| | PostGIS 2.5 | PostGIS 3 | +| | PostGIS 2.5 | PostGIS 3.2 | +---------------+-----------------------+------------------------+ -| PostgreSQL 12 | |12_25_bionic| | - |12_3_bionic| | -| | | - |12_3_focal| | +| PostgreSQL 12 | |12_25_bionic| | - |12_32_bionic| | +| | | - |12_32_focal| | +---------------+-----------------------+------------------------+ .. |12_25_bionic| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-18.04%5D+PostgreSQL+12+and+PostGIS+2.5%22 -.. |12_3_bionic| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?label=Ubuntu%2018.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-18.04%5D+PostgreSQL+12+and+PostGIS+3%22 +.. |12_32_bionic| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2012%20and%20PostGIS%203.2?label=Ubuntu%2018.04&logo=github&style=plastic :target: https://github.com/pgpointcloud/pointcloud/actions?query=workflow%3A%22%5Bubuntu-18.04%5D+PostgreSQL+12+and+PostGIS+3.2%22 -.. |12_3_focal| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203?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+3%22 +.. |12_32_focal| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2012%20and%20PostGIS%203.2?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+3.2%22 .. _`source`: https://github.com/hobu/laz-perf .. _`DockerHub`: https://hub.docker.com/_/postgres From 32e04ed2a6bf5c5d924aa9f023d8b6affd709d74 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Tue, 8 Feb 2022 08:57:43 +0100 Subject: [PATCH 7/7] Remove unecessary env variables for pgpointcloud build --- .github/workflows/bionic_postgres12_postgis25.yml | 3 --- .github/workflows/bionic_postgres12_postgis32.yml | 3 --- .github/workflows/focal_postgres12_postgis32.yml | 3 --- 3 files changed, 9 deletions(-) diff --git a/.github/workflows/bionic_postgres12_postgis25.yml b/.github/workflows/bionic_postgres12_postgis25.yml index 427c09f..1f8c31a 100644 --- a/.github/workflows/bionic_postgres12_postgis25.yml +++ b/.github/workflows/bionic_postgres12_postgis25.yml @@ -19,9 +19,6 @@ jobs: POSTGIS_VERSION: 2.5 run: .github/scripts/postgresql_postgis.sh - name: Install and check PgPointCloud - env: - POSTGRESQL_VERSION: 12 - POSTGIS_VERSION: 2.5 run: .github/scripts/pgpointcloud.sh - name: Error if: ${{ failure() }} diff --git a/.github/workflows/bionic_postgres12_postgis32.yml b/.github/workflows/bionic_postgres12_postgis32.yml index fe2803a..cb730d8 100644 --- a/.github/workflows/bionic_postgres12_postgis32.yml +++ b/.github/workflows/bionic_postgres12_postgis32.yml @@ -19,9 +19,6 @@ jobs: POSTGIS_VERSION: 3 run: .github/scripts/postgresql_postgis.sh - name: Install and check PgPointCloud - env: - POSTGRESQL_VERSION: 12 - POSTGIS_VERSION: 3 run: .github/scripts/pgpointcloud.sh - name: Error if: ${{ failure() }} diff --git a/.github/workflows/focal_postgres12_postgis32.yml b/.github/workflows/focal_postgres12_postgis32.yml index 3ec7297..36c166c 100644 --- a/.github/workflows/focal_postgres12_postgis32.yml +++ b/.github/workflows/focal_postgres12_postgis32.yml @@ -19,9 +19,6 @@ jobs: POSTGIS_VERSION: 3 run: .github/scripts/postgresql_postgis.sh - name: Install and check PgPointCloud - env: - POSTGRESQL_VERSION: 12 - POSTGIS_VERSION: 3 run: .github/scripts/pgpointcloud.sh - name: Error if: ${{ failure() }}