Skip to content

Commit

Permalink
Merge branch 'main' into devel
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/vcglib
  • Loading branch information
alemuntoni committed May 8, 2024
2 parents 608e512 + b0767f5 commit e6e8718
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/BuildMeshLab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/CreateRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down

0 comments on commit e6e8718

Please sign in to comment.