From cbdfc770ab68808ccb5482189cac913ac5339bd4 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 19 Mar 2026 23:55:33 +0800 Subject: [PATCH] simplify mac download --- .github/workflows/build_orca.yml | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 99957f4043..cb28b23311 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -130,27 +130,20 @@ jobs: name: OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }} path: ${{ github.workspace }}/OrcaSlicer_Mac_bundle_${{ inputs.arch }}_${{ github.sha }}.tar.gz - - name: Download macOS arm64 app bundle + - name: Download macOS app bundles if: runner.os == 'macOS' && inputs.macos-combine-only uses: actions/download-artifact@v7 with: - name: OrcaSlicer_Mac_bundle_arm64_${{ github.sha }} - path: ${{ github.workspace }}/mac_bundles/arm64 - - - name: Download macOS x86_64 app bundle - if: runner.os == 'macOS' && inputs.macos-combine-only - uses: actions/download-artifact@v7 - with: - name: OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }} - path: ${{ github.workspace }}/mac_bundles/x86_64 + pattern: OrcaSlicer_Mac_bundle_*_${{ github.sha }} + path: ${{ github.workspace }}/mac_bundles - name: Extract macOS app bundles if: runner.os == 'macOS' && inputs.macos-combine-only working-directory: ${{ github.workspace }} run: | mkdir -p build/arm64 build/x86_64 - arm_bundle=$(find "${{ github.workspace }}/mac_bundles/arm64" -name '*.tar.gz' -print -quit) - x86_bundle=$(find "${{ github.workspace }}/mac_bundles/x86_64" -name '*.tar.gz' -print -quit) + arm_bundle=$(find "${{ github.workspace }}/mac_bundles/OrcaSlicer_Mac_bundle_arm64_${{ github.sha }}" -name '*.tar.gz' -print -quit) + x86_bundle=$(find "${{ github.workspace }}/mac_bundles/OrcaSlicer_Mac_bundle_x86_64_${{ github.sha }}" -name '*.tar.gz' -print -quit) tar -xzvf "$arm_bundle" -C "${{ github.workspace }}/build/arm64" tar -xzvf "$x86_bundle" -C "${{ github.workspace }}/build/x86_64"