Merge branch 'main' into devel

# Conflicts: # src/vcglib
cnr-isti-vclab · May 8, 2024 · e6e8718 · e6e8718
2 parents 608e512 + b0767f5
commit e6e8718
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-20.04', 'macos-latest', 'macos-14', 'windows-latest']
+        os: ['ubuntu-20.04', 'macos-13', 'macos-latest', 'windows-latest']
         precision: [single_precision, double_precision]
     steps:
     - uses: actions/checkout@v4
@@ -26,7 +26,7 @@ jobs:
       uses: ./.github/actions/0_setup
       with:
         qt-version: ${{env.QT_VERSION}}
-        use-jurpel-qt-action: ${{matrix.os != 'macos-14'}}
+        use-jurpel-qt-action: ${{matrix.os != 'macos-latest'}}
     - name: Setup env variables
       id: envs
       shell: bash
@@ -37,7 +37,7 @@ jobs:
         else
           echo "artifact_suffix=_$ARCH" >> $GITHUB_OUTPUT
         fi
-        if [ "${{matrix.os}}" == "macos-14" ]; then
+        if [ "${{matrix.os}}" == "macos-latest" ]; then
           echo "build_options=--use_brew_qt" >> $GITHUB_OUTPUT
         else
           echo "build_options=" >> $GITHUB_OUTPUT
@@ -53,7 +53,7 @@ jobs:
     - name: Deploy
       uses: ./.github/actions/2_deploy
       with:
-        use-brew-qt: ${{matrix.os == 'macos-14'}}
+        use-brew-qt: ${{matrix.os == 'macos-latest'}}
         mac-certificate: ${{ secrets.MACOS_CERTIFICATE }}
         mac-certificate-id: ${{ secrets.MACOS_CERT_ID }}
         mac-certificate-pssw: ${{ secrets.MACOS_CERTIFICATE_PSSW }}

diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: ['ubuntu-20.04', 'macos-latest', 'macos-14', 'windows-latest']
+        os: ['ubuntu-20.04', 'macos-13', 'macos-latest', 'windows-latest']
         precision: [single_precision, double_precision]
     steps:
     - uses: actions/checkout@v4
@@ -45,7 +45,7 @@ jobs:
       uses: ./.github/actions/0_setup
       with:
         qt-version: ${{env.QT_VERSION}}
-        use-jurpel-qt-action: ${{matrix.os != 'macos-14'}}
+        use-jurpel-qt-action: ${{matrix.os != 'macos-latest'}}
     - name: Setup env variables
       id: envs
       shell: bash
@@ -56,7 +56,7 @@ jobs:
         else
           echo "artifact_suffix=_$ARCH" >> $GITHUB_OUTPUT
         fi
-        if [ "${{matrix.os}}" == "macos-14" ]; then
+        if [ "${{matrix.os}}" == "macos-latest" ]; then
           echo "build_options=--use_brew_qt" >> $GITHUB_OUTPUT
         else
           echo "build_options=" >> $GITHUB_OUTPUT
@@ -71,7 +71,7 @@ jobs:
     - name: Deploy
       uses: ./.github/actions/2_deploy
       with:
-        use-brew-qt: ${{matrix.os == 'macos-14'}}
+        use-brew-qt: ${{matrix.os == 'macos-latest'}}
         mac-certificate: ${{ secrets.MACOS_CERTIFICATE }}
         mac-certificate-id: ${{ secrets.MACOS_CERT_ID }}
         mac-certificate-pssw: ${{ secrets.MACOS_CERTIFICATE_PSSW }}

diff --git a/src/vcglib b/src/vcglib
+3 −2		.github/workflows/BuildExamples.yml
+13 −2		vcg/complex/algorithms/mesh_assert.h
+2 −2		vcg/complex/algorithms/update/flag.h
+15 −0		vcg/complex/algorithms/update/selection.h
+1 −1		vcg/simplex/edge/pos.h