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_postgis3.yml b/.github/workflows/bionic_postgres12_postgis32.yml similarity index 81% rename from .github/workflows/bionic_postgres12_postgis3.yml rename to .github/workflows/bionic_postgres12_postgis32.yml index 77d2bf8..cb730d8 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: @@ -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 new file mode 100644 index 0000000..36c166c --- /dev/null +++ b/.github/workflows/focal_postgres12_postgis32.yml @@ -0,0 +1,25 @@ +name: "[ubuntu-20.04] PostgreSQL 12 and PostGIS 3.2" + +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 + run: .github/scripts/pgpointcloud.sh + - name: Error + if: ${{ failure() }} + run: cat pgsql/regression.diffs diff --git a/README.md b/README.md index d48a332..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) | +| | 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 ae4f38b..ea145ae 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.2 | ++---------------+-----------------------+------------------------+ +| PostgreSQL 12 | |12_25_bionic| | - |12_32_bionic| | +| | | - |12_32_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_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_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