From 76030c254fece29ce3d5755f67b5e76e5c789094 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Tue, 28 Feb 2023 00:27:47 -0500 Subject: [PATCH] Prevent web deploy from overwriting doxygen folder Add 3.11 branch to CI status --- .github/workflows/web.yml | 9 +++++++-- web/content/development/ci_status.md | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index d91ccbde46..04736c0598 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -50,9 +50,14 @@ jobs: cp -ra build.cmake/doxygen/doxygen_docs/html/* public_html/doxygen - name: 'Deploy 🚀' - uses: JamesIves/github-pages-deploy-action@4.1.5 + uses: JamesIves/github-pages-deploy-action@v4.4.1 with: branch: gh-pages # The branch the action should deploy to. - folder: public_html # The folder the action should depl y. + folder: public_html # The folder the action should deploy. + # This does default to true, + # but specifying it in case we want to change it later + clean: true + clean-exclude: | + doxygen/* diff --git a/web/content/development/ci_status.md b/web/content/development/ci_status.md index 634e96422a..95e0951ef6 100644 --- a/web/content/development/ci_status.md +++ b/web/content/development/ci_status.md @@ -4,17 +4,17 @@ date: 2021-10-04T14:21:00-07:00 draft: false --- -| CI | main | 3.10 | 3.9 | 3.8 | 3.7 | -| ------ | ------ | ------ | ------ | ------ | ------ | -| **GitHub** | [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=main)](https://github.com/libgeos/geos/actions?query=workflow%3ACI+branch%3Amain) | [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.10)](https://github.com/libgeos/geos/actions?query=branch%3A3.10) | [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.9)](https://github.com/libgeos/geos/actions?query=branch%3A3.9)| [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.8)](https://github.com/libgeos/geos/actions?query=branch%3A3.8)| [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.7)](https://github.com/libgeos/geos/actions?query=branch%3A3.7) | -| **GitLab** | [![GitLab](https://gitlab.com/geos/libgeos/badges/main/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/main) | [![GitLab](https://gitlab.com/geos/libgeos/badges/3.10/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.10)| [![GitLab](https://gitlab.com/geos/libgeos/badges/3.9/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.9)| [![GitLab](https://gitlab.com/geos/libgeos/badges/3.8/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.8) | [![GitLab](https://gitlab.com/geos/libgeos/badges/3.7/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.7) | -| **Debbie** | [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Master/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.10)](https://debbie.postgis.net/view/job/GEOS_Branch_3.10/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.9)](https://debbie.postgis.net/view/job/GEOS_Branch_3.9/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.8)](https://debbie.postgis.net/view/job/GEOS_Branch_3.8/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.7)](https://debbie.postgis.net/view/job/GEOS_Branch_3.7/)| -| **Winnie** | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.10/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.10/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.9/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.9/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.8/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.8/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/) | -| **Dronie** | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/main)](https://dronie.osgeo.org/geos/geos?ref=refs/heads/main) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.10)](https://dronie.osgeo.org/geos/geos?refs/heads/3.10) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.9)](https://dronie.osgeo.org/geos/geos?refs/heads/3.9) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.8)](https://dronie.osgeo.org/geos/geos?refs/heads/3.8) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.7)](https://dronie.osgeo.org/geos/geos?refs/heads/3.7) | -| **Bessie** | [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.9})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.8})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.7})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| -| **Bessie32** | [![Bessie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) |[![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) | [![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.9})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32)| [![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.8})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32)| [![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.7})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) | -| **Berrie** | [![Berrie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie) |[![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie) | | | | -| **Berrie64** | [![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie64&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie64) | [![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie64&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie64)| | +| CI | main | 3.11 | 3.10 | 3.9 | 3.8 | 3.7 | +| ------ | ------ | ------ | ------ | ------ | ------ | ------ | +| **GitHub** | [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=main)](https://github.com/libgeos/geos/actions?query=workflow%3ACI+branch%3Amain) | [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.11)](https://github.com/libgeos/geos/actions?query=branch%3A3.11) | [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.10)](https://github.com/libgeos/geos/actions?query=branch%3A3.10) | [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.9)](https://github.com/libgeos/geos/actions?query=branch%3A3.9)| [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.8)](https://github.com/libgeos/geos/actions?query=branch%3A3.8)| [![GitHub](https://github.com/libgeos/geos/workflows/CI/badge.svg?branch=3.7)](https://github.com/libgeos/geos/actions?query=branch%3A3.7) | +| **GitLab** | [![GitLab](https://gitlab.com/geos/libgeos/badges/main/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/main) | [![GitLab](https://gitlab.com/geos/libgeos/badges/3.11/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.11) | [![GitLab](https://gitlab.com/geos/libgeos/badges/3.10/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.10)| [![GitLab](https://gitlab.com/geos/libgeos/badges/3.9/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.9)| [![GitLab](https://gitlab.com/geos/libgeos/badges/3.8/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.8) | [![GitLab](https://gitlab.com/geos/libgeos/badges/3.7/pipeline.svg)](https://gitlab.com/geos/libgeos/commits/3.7) | +| **Debbie** | [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Master)](https://debbie.postgis.net/view/GEOS/job/GEOS_Master/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.11)](https://debbie.postgis.net/view/job/GEOS_Branch_3.11/) | [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.10)](https://debbie.postgis.net/view/job/GEOS_Branch_3.10/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.9)](https://debbie.postgis.net/view/job/GEOS_Branch_3.9/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.8)](https://debbie.postgis.net/view/job/GEOS_Branch_3.8/)| [![Debbie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Branch_3.7)](https://debbie.postgis.net/view/job/GEOS_Branch_3.7/)| +| **Winnie** | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Master/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.11/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.11/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.10/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.10/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.9/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.9/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.8/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.8/) | [![Winnie](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/badge/icon)](https://winnie.postgis.net:444/view/GEOS/job/GEOS_Branch_3.7/) | +| **Dronie** | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/main)](https://dronie.osgeo.org/geos/geos?ref=refs/heads/main) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.11)](https://dronie.osgeo.org/geos/geos?refs/heads/3.11) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.10)](https://dronie.osgeo.org/geos/geos?refs/heads/3.10) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.9)](https://dronie.osgeo.org/geos/geos?refs/heads/3.9) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.8)](https://dronie.osgeo.org/geos/geos?refs/heads/3.8) | [![Dronie](https://dronie.osgeo.org/api/badges/geos/geos/status.svg?ref=refs/heads/3.7)](https://dronie.osgeo.org/geos/geos?refs/heads/3.7) | +| **Bessie** | [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.11})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie) | [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.9})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.8})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| [![Bessie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie&build=last:${params.reference=refs/heads/3.7})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie)| +| **Bessie32** | [![Bessie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) |[![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.11})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) |[![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) | [![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.9})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32)| [![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.8})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32)| [![Berrie32](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=bessie32&build=last:${params.reference=refs/heads/3.7})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=bessie32) | +| **Berrie** | [![Berrie](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie) |[![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie&build=last:${params.reference=refs/heads/3.11})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie) |[![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie) | | | | +| **Berrie64** | [![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie64&BRANCH=main)](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie64) | [![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie64&build=last:${params.reference=refs/heads/3.11})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie64) | [![Berrie64](https://debbie.postgis.net/buildStatus/icon?job=GEOS_Worker_Run/label=berrie64&build=last:${params.reference=refs/heads/3.10})](https://debbie.postgis.net/view/GEOS/job/GEOS_Worker_Run/label=berrie64)| |