Merge pull request #335 from pgpointcloud/ubuntu_22

Remove Ubuntu 18.04 and add Ubuntu 22.04 / use PostGIS 3.3
This commit is contained in:
Paul Blottiere 2023-07-19 23:10:23 +02:00 committed by GitHub
commit efc84e01fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 117 additions and 114 deletions

View File

@ -1,27 +0,0 @@
name: "[ubuntu-18.04] PostgreSQL 10 and PostGIS 2.5"
on:
push:
branches:
- master
pull_request:
jobs:
build:
name: Building and testing
runs-on: ubuntu-18.04
steps:
- name: Check out repository code
uses: actions/checkout@v2
- name: Install PostgreSQL and PostGIS
env:
POSTGRESQL_VERSION: 10
POSTGIS_VERSION: 2.5
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

View File

@ -1,27 +0,0 @@
name: "[ubuntu-18.04] PostgreSQL 11 and PostGIS 2.5"
on:
push:
branches:
- master
pull_request:
jobs:
build:
name: Building and testing
runs-on: ubuntu-18.04
steps:
- name: Check out repository code
uses: actions/checkout@v2
- name: Install PostgreSQL and PostGIS
env:
POSTGRESQL_VERSION: 11
POSTGIS_VERSION: 2.5
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

View File

@ -1,27 +0,0 @@
name: "[ubuntu-18.04] PostgreSQL 12 and PostGIS 2.5"
on:
push:
branches:
- master
pull_request:
jobs:
build:
name: Building and testing
runs-on: ubuntu-18.04
steps:
- name: Check out repository code
uses: actions/checkout@v2
- name: Install PostgreSQL and PostGIS
env:
POSTGRESQL_VERSION: 12
POSTGIS_VERSION: 2.5
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

View File

@ -9,7 +9,7 @@ on:
jobs:
c_code_layout:
name: C linter
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Check out repository code
uses: actions/checkout@v2
@ -19,7 +19,7 @@ jobs:
run: clang-format --dry-run --Werror -style=file pgsql/*.c pgsql/*.h lib/*.c lib/*.cpp lib/*.hpp lib/*.h lib/cunit/*.c lib/cunit/*.h
sql_code_layout:
name: SQL linter
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Install nvm
uses: actions/setup-node@v1

View File

@ -1,4 +1,4 @@
name: "[ubuntu-20.04] PostgreSQL 12 and PostGIS 3.2"
name: "[ubuntu-20.04] PostgreSQL 12 and PostGIS 3.3"
on:
push:

View File

@ -1,4 +1,4 @@
name: "[ubuntu-20.04] PostgreSQL 13 and PostGIS 3.2"
name: "[ubuntu-20.04] PostgreSQL 13 and PostGIS 3.3"
on:
push:

View File

@ -1,4 +1,4 @@
name: "[ubuntu-20.04] PostgreSQL 14 and PostGIS 3.2"
name: "[ubuntu-20.04] PostgreSQL 14 and PostGIS 3.3"
on:
push:

View File

@ -1,4 +1,4 @@
name: "[ubuntu-20.04] PostgreSQL 15 and PostGIS 3.2"
name: "[ubuntu-20.04] PostgreSQL 15 and PostGIS 3.3"
on:
push:

View File

@ -1,4 +1,4 @@
name: "[ubuntu-18.04] PostgreSQL 12 and PostGIS 3.2"
name: "[ubuntu-22.04] PostgreSQL 12 and PostGIS 3.3"
on:
push:
@ -9,7 +9,7 @@ on:
jobs:
build:
name: Building and testing
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- name: Check out repository code
uses: actions/checkout@v2

View File

@ -0,0 +1,27 @@
name: "[ubuntu-22.04] PostgreSQL 12 and PostGIS 3.3"
on:
push:
branches:
- master
pull_request:
jobs:
build:
name: Building and testing
runs-on: ubuntu-22.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

View File

@ -0,0 +1,27 @@
name: "[ubuntu-22.04] PostgreSQL 12 and PostGIS 3.3"
on:
push:
branches:
- master
pull_request:
jobs:
build:
name: Building and testing
runs-on: ubuntu-22.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

View File

@ -0,0 +1,27 @@
name: "[ubuntu-22.04] PostgreSQL 12 and PostGIS 3.3"
on:
push:
branches:
- master
pull_request:
jobs:
build:
name: Building and testing
runs-on: ubuntu-22.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

View File

@ -10,11 +10,9 @@ https://pgpointcloud.github.io/pointcloud/ for more information.
## Continuous integration
| | PostGIS 2.5 | PostGIS 3.2 |
| | PostGIS 2.5 | PostGIS 3.3 |
| ------------------ |:-------------:|:-----------:|
| PostgreSQL 10 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2010%20and%20PostGIS%202.5?label=Ubuntu%2018.04&logo=github&style=plastic) | |
| PostgreSQL 11 | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2011%20and%20PostGIS%202.5?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.2?label=Ubuntu%2018.04&logo=github&style=plastic)<br />![](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) |
| PostgreSQL 13 | | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2013%20and%20PostGIS%203.2?label=Ubuntu%2020.04&logo=github&style=plastic) |
| PostgreSQL 14 | | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2014%20and%20PostGIS%203.2?label=Ubuntu%2020.04&logo=github&style=plastic) |
| PostgreSQL 15 | | ![](https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2015%20and%20PostGIS%203.2?label=Ubuntu%2020.04&logo=github&style=plastic) |
| 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)<br />![](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)<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) |
| 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) |

View File

@ -137,43 +137,48 @@ pgPointcloud tests are run with `Github Actions`_ on several Ubuntu versions
and with various PostgreSQL/PostGIS releases:
+--------------------+-----------------------+------------------------+
| | PostGIS 2.5 | PostGIS 3.2 |
| | PostGIS 2.5 | PostGIS 3.3 |
+--------------------+-----------------------+------------------------+
| PostgreSQL 10 | |10_25_bionic| | |
+--------------------+-----------------------+------------------------+
| PostgreSQL 11 | |11_25_bionic| | |
+--------------------+-----------------------+------------------------+
| PostgreSQL 12 | |12_25_bionic| | |12_32_bionic| |
| PostgreSQL 12 | |12_25_focal| | |12_33_focal| |
| | | |
| | | |12_32_focal| |
| | | |12_33_jammy| |
+--------------------+-----------------------+------------------------+
| PostgreSQL 13 | | |13_32_focal| |
| PostgreSQL 13 | | |13_33_focal| |
| | | |
| | | |13_33_jammy| |
+--------------------+-----------------------+------------------------+
| PostgreSQL 14 | | |14_32_focal| |
| PostgreSQL 14 | | |14_33_focal| |
| | | |
| | | |14_33_jammy| |
+--------------------+-----------------------+------------------------+
| PostgreSQL 15 | | |15_32_focal| |
| PostgreSQL 15 | | |15_33_focal| |
| | | |
| | | |15_33_jammy| |
+--------------------+-----------------------+------------------------+
.. |10_25_bionic| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2010%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+10+and+PostGIS+2.5%22
.. |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
.. |11_25_bionic| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-18.04%5D%20PostgreSQL%2011%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+11+and+PostGIS+2.5%22
.. |12_33_focal| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres12_postgis33.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+3.3%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_33_jammy| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/jammy_postgres12_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+12+and+PostGIS+3.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
.. |13_33_focal| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres13_postgis33.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+13+and+PostGIS+3.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
.. |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_32_focal| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2013%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+13+and+PostGIS+3.2%22
.. |14_33_focal| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres14_postgis33.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+14+and+PostGIS+3.3%22
.. |14_32_focal| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2014%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+14+and+PostGIS+3.2%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
.. |15_32_focal| image:: https://img.shields.io/github/workflow/status/pgpointcloud/pointcloud/%5Bubuntu-20.04%5D%20PostgreSQL%2015%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+15+and+PostGIS+3.2%22
.. |15_33_focal| image:: https://img.shields.io/github/actions/workflow/status/pgpointcloud/pointcloud/focal_postgres15_postgis33.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+15+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
.. _`source`: https://github.com/hobu/laz-perf
.. _`DockerHub`: https://hub.docker.com/_/postgres
.. _`GitHub Actions`: https://github.com/pgpointcloud/pointcloud/actions
------------------------------------------------------------------------------
Release
------------------------------------------------------------------------------