diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml index b67e73dad..243538380 100644 --- 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 index 93e919424..38c8cb100 100644 --- 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 index 49602d841..d0bfb6c62 160000 --- a/src/vcglib +++ b/src/vcglib @@ -1 +1 @@ -Subproject commit 49602d841710113492874e5ae78aa2245a3209de +Subproject commit d0bfb6c6245a3b66b709d8325af28a462a746756