diff --git a/.github/workflows/BuildMeshLab.yml b/.github/workflows/BuildMeshLab.yml index 45f184e90..3e9b0a88b 100644 --- a/.github/workflows/BuildMeshLab.yml +++ b/.github/workflows/BuildMeshLab.yml @@ -38,9 +38,12 @@ jobs: fi if [ "${{matrix.os}}" == "macos-14" ]; then echo "build_options=--use_brew_qt" >> $GITHUB_OUTPUT + echo "artifact_os=${{ runner.os }}_arm64" >> $GITHUB_OUTPUT else echo "build_options=" >> $GITHUB_OUTPUT + echo "artifact_os=${{ runner.os }}" >> $GITHUB_OUTPUT fi + - name: Build uses: ./.github/actions/1_build with: @@ -60,10 +63,10 @@ jobs: - name: Upload MeshLab Portable uses: actions/upload-artifact@v4 with: - name: MeshLab_${{ runner.os }}_portable${{steps.envs.outputs.artifact_suffix}} + name: MeshLab_${{ steps.envs.outputs.artifact_os }}_portable${{steps.envs.outputs.artifact_suffix}} path: install/ - name: Upload MeshLab Packages uses: actions/upload-artifact@v4 with: - name: MeshLab_${{ runner.os }}_packages${{steps.envs.outputs.artifact_suffix}} + name: MeshLab_${{ steps.envs.outputs.artifact_os }}_packages${{steps.envs.outputs.artifact_suffix}} path: packages/MeshLab* \ No newline at end of file diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index 9f446a867..b706cd326 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -52,12 +52,20 @@ jobs: else echo "artifact_suffix=" >> $GITHUB_OUTPUT fi + if [ "${{matrix.os}}" == "macos-14" ]; then + echo "build_options=--use_brew_qt" >> $GITHUB_OUTPUT + echo "artifact_os=${{ runner.os }}_arm64" >> $GITHUB_OUTPUT + else + echo "build_options=" >> $GITHUB_OUTPUT + echo "artifact_os=${{ runner.os }}" >> $GITHUB_OUTPUT + fi - name: Build uses: ./.github/actions/1_build with: cache-path: src/external/downloads/* cache-key: external-libraries build-precision: ${{matrix.precision}} + build-options: ${{steps.envs.outputs.build_options}} - name: Deploy uses: ./.github/actions/2_deploy with: