From 8e0ebb9a39ca8e26d7c1809599244fc1070b8445 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 10 Jan 2025 14:27:42 +0100 Subject: [PATCH 1/3] update status of border edges when removing a (degenerate) border face --- .../internal/Isotropic_remeshing/remesh_impl.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h index 02925a145f2..a40970ed97b 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h @@ -1692,6 +1692,17 @@ namespace internal { // else keep current status for en and eno } + void remove_border_face(const halfedge_descriptor h) + { + CGAL_assertion(is_border(opposite(h, mesh_), mesh_)); + for (halfedge_descriptor hf : halfedges_around_face(h, mesh_)) + { + set_status(hf, MESH_BORDER); //only 1 or 2 of the listed halfedges + //will survive face removal, but status will be correct + } + CGAL::Euler::remove_face(h, mesh_); + } + template bool fix_degenerate_faces(const vertex_descriptor& v, Bimap& short_edges, @@ -1721,7 +1732,7 @@ namespace internal { if(is_border(opposite(h, mesh_), mesh_)) { - CGAL::Euler::remove_face(h, mesh_); + remove_border_face(h); continue; } @@ -1732,7 +1743,7 @@ namespace internal { if(is_border(hfo, mesh_)) { - CGAL::Euler::remove_face(h, mesh_); + remove_border_face(h); break; } vertex_descriptor vc = target(hf, mesh_); From 170952b9274a7e14e4f6ad4e2ecb3497db5b4e14 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Wed, 15 Jan 2025 14:35:28 +0100 Subject: [PATCH 2/3] FOR 5.6.x ONLY: use ubuntu-22.04 as Github runner `ubuntu-latest` was recently turned from 22.04 to 24.04. And 5.6.x is not ready for that. See the run https://github.com/CGAL/cgal/actions/runs/12787411585/job/35648286539?pr=8688#step:3:46 DO NOT MERGE INTO `6.0.x` or `master`. --- .github/workflows/Remove_labels.yml | 2 +- .github/workflows/build_doc.yml | 2 +- .github/workflows/checks.yml | 2 +- .github/workflows/cmake-all.yml | 4 ++-- .github/workflows/delete_doc.yml | 2 +- .github/workflows/demo.yml | 8 ++++---- .github/workflows/filter_testsuite.yml | 2 +- .github/workflows/list_workflow_last_run.yml | 2 +- .github/workflows/send_email.yml | 2 +- .github/workflows/wiki_notification.yml | 2 +- ccpp.yml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Remove_labels.yml b/.github/workflows/Remove_labels.yml index 0624fe7a1df..3a5465b57f1 100644 --- a/.github/workflows/Remove_labels.yml +++ b/.github/workflows/Remove_labels.yml @@ -5,7 +5,7 @@ on: workflow_dispatch: jobs: remove_label: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: contains(github.event.pull_request.labels.*.name, 'Tested') name: remove label steps: diff --git a/.github/workflows/build_doc.yml b/.github/workflows/build_doc.yml index 85158cfc285..b00c8e98e79 100644 --- a/.github/workflows/build_doc.yml +++ b/.github/workflows/build_doc.yml @@ -14,7 +14,7 @@ jobs: contents: read # to fetch code (actions/checkout) pull-requests: write # to create comment - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/github-script@v6 id: get_round diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 0af6e276e6e..5dc396a0f17 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -8,7 +8,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/cmake-all.yml b/.github/workflows/cmake-all.yml index d0507b4d430..6fe8d99f4ed 100644 --- a/.github/workflows/cmake-all.yml +++ b/.github/workflows/cmake-all.yml @@ -8,7 +8,7 @@ permissions: jobs: cmake-testsuite: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -22,7 +22,7 @@ jobs: cmake-testsuite-with-qt5: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/delete_doc.yml b/.github/workflows/delete_doc.yml index 38f5ab445ac..16393b4ee7a 100644 --- a/.github/workflows/delete_doc.yml +++ b/.github/workflows/delete_doc.yml @@ -11,7 +11,7 @@ jobs: permissions: contents: write # for Git to git push - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index 123458ebe04..66f390edaa4 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -7,7 +7,7 @@ permissions: jobs: batch_1: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: install dependencies @@ -15,7 +15,7 @@ jobs: - name: run1 run: ./.github/test.sh 0 ${{ github.workspace }} batch_2: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: install dependencies @@ -23,7 +23,7 @@ jobs: - name: run2 run: ./.github/test.sh 1 ${{ github.workspace }} batch_3: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: install dependencies @@ -31,7 +31,7 @@ jobs: - name: run3 run: ./.github/test.sh 2 ${{ github.workspace }} batch_4: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - name: install dependencies diff --git a/.github/workflows/filter_testsuite.yml b/.github/workflows/filter_testsuite.yml index 48e4f39d65c..2ff150710e7 100644 --- a/.github/workflows/filter_testsuite.yml +++ b/.github/workflows/filter_testsuite.yml @@ -12,7 +12,7 @@ jobs: pull-requests: write # to create comment if: (github.event.comment.user.login == 'sloriot' || github.event.comment.user.login == 'lrineau') && contains(github.event.comment.body, '/testme') - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/github-script@v6 id: get_label diff --git a/.github/workflows/list_workflow_last_run.yml b/.github/workflows/list_workflow_last_run.yml index 79b1d2c0634..31b41ad8fb8 100644 --- a/.github/workflows/list_workflow_last_run.yml +++ b/.github/workflows/list_workflow_last_run.yml @@ -7,7 +7,7 @@ GH_TOKEN: ${{ github.token }} jobs: list_workflow: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: messages: ${{ steps.cat_output.outputs.message }} steps: diff --git a/.github/workflows/send_email.yml b/.github/workflows/send_email.yml index cb990eca146..97fe499c32a 100644 --- a/.github/workflows/send_email.yml +++ b/.github/workflows/send_email.yml @@ -19,7 +19,7 @@ on: jobs: send_email: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: install ssh keys run: | diff --git a/.github/workflows/wiki_notification.yml b/.github/workflows/wiki_notification.yml index 456fefa51e3..ae1649ec2e2 100644 --- a/.github/workflows/wiki_notification.yml +++ b/.github/workflows/wiki_notification.yml @@ -4,7 +4,7 @@ on: gollum jobs: prepare_email: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: messages: ${{ steps.set-result.outputs.result }} steps: diff --git a/ccpp.yml b/ccpp.yml index 75bbbee4918..9d5d5b27e59 100644 --- a/ccpp.yml +++ b/ccpp.yml @@ -5,7 +5,7 @@ on: [push] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: configure all From fe88db2bb36672d7edd6353283410982eac0997a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 17 Jan 2025 18:46:13 +0100 Subject: [PATCH 3/3] workaround issue with file command --- Scripts/developer_scripts/test_merge_of_branch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/developer_scripts/test_merge_of_branch b/Scripts/developer_scripts/test_merge_of_branch index cdf1070fa87..f73f1ebb706 100755 --- a/Scripts/developer_scripts/test_merge_of_branch +++ b/Scripts/developer_scripts/test_merge_of_branch @@ -179,7 +179,7 @@ fi #check no file contains non-utf8 characters echo '.. Checking if non utf-8 characters are used...' -txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\n", $2; }' | xargs file -N | grep "text" | grep -E -v "UTF-8|ASCII|CSV|XML|EPS|FIG|assembler source|Perl script|from flex") +txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\n", $2; }' | xargs file -N | grep "text" | grep -E -v "UTF-8|ASCII|CSV|XML|EPS|FIG|JSON|pixmap|magic|assembler source|Perl script|from flex") if [ -n "${txt_not_utf8}" ]; then echo "The following files have non utf-8 characters:" echo ${txt_not_utf8}