From 2e9ef54de970e7bf03d532b6c978f1e70708b8b0 Mon Sep 17 00:00:00 2001 From: Alessandro Muntoni Date: Fri, 2 Feb 2024 10:18:28 +0100 Subject: [PATCH] fix build macos arm --- .github/actions/1_build/action.yml | 2 +- .github/workflows/BuildMeshLab.yml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/1_build/action.yml b/.github/actions/1_build/action.yml index de2f7eccc..64374272a 100644 --- a/.github/actions/1_build/action.yml +++ b/.github/actions/1_build/action.yml @@ -46,7 +46,7 @@ runs: - name: Cache external libraries sources id: cache-ext-libs if: ${{ inputs.cache-path != '' }} - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ inputs.cache-path }} key: ${{ runner.os }}-${{ inputs.cache-key }} diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml index fc5109ae9..1d2445a44 100644 --- a/.github/workflows/BuildMeshLab.yml +++ b/.github/workflows/BuildMeshLab.yml @@ -19,7 +19,7 @@ jobs: os: ['ubuntu-20.04', 'macos-latest', 'macos-14', 'windows-latest'] precision: [single_precision, double_precision] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Setup Environment @@ -37,6 +37,11 @@ jobs: else echo "artifact_suffix=_$ARCH" >> $GITHUB_OUTPUT fi + if [ "${{matrix.os}}" == "macos-14" ]; then + echo "build_options=--use_brew_qt" >> $GITHUB_OUTPUT + else + echo "build_options=" >> $GITHUB_OUTPUT + fi - name: Build uses: ./.github/actions/1_build with: