From 783f9926e3e9960ad938fccb80844f34030cadb5 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 14 Feb 2026 18:11:06 +0800 Subject: [PATCH] Revert "Switch to self hosted mac runner (#12024)" This reverts commit f1212be6bb0912930ed525a915269e44e6a2d176. --- .github/workflows/build_all.yml | 2 +- .github/workflows/build_check_cache.yml | 2 +- .github/workflows/build_deps.yml | 14 +++++----- .github/workflows/build_orca.yml | 36 ++++++++++++------------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 010775d119..41d489d4d8 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -66,7 +66,7 @@ jobs: matrix: include: - os: windows-latest - - os: orca-macos-arm64 + - os: macos-14 arch: arm64 # Don't run scheduled builds on forks: if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index 61de1f3ff0..fee5a6e955 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -33,7 +33,7 @@ jobs: - name: set outputs id: set_outputs env: - dep-folder-name: ${{ inputs.os != 'orca-macos-arm64' && '/OrcaSlicer_dep' || '' }} + dep-folder-name: ${{ inputs.os != 'macos-14' && '/OrcaSlicer_dep' || '' }} output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} run: | echo cache-key=${{ inputs.os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 2ebb53dd1f..6cec66f24b 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -74,18 +74,18 @@ jobs: cd ${{ github.workspace }}/deps/build - name: Build on Mac ${{ inputs.arch }} - if: inputs.os == 'orca-macos-arm64' + if: inputs.os == 'macos-14' working-directory: ${{ github.workspace }} run: | - # brew install automake texinfo libtool - # brew list - # brew uninstall --ignore-dependencies zstd - ./build_release_macos.sh -dx -a universal -t 10.15 + brew install automake texinfo libtool + brew list + brew uninstall --ignore-dependencies zstd + ./build_release_macos.sh -dx -a universal -t 10.15 -1 for arch in arm64 x86_64; do (cd "${{ github.workspace }}/deps/build/${arch}" && \ find . -mindepth 1 -maxdepth 1 ! -name 'OrcaSlicer_dep' -exec rm -rf {} +) done - # brew install zstd + brew install zstd - name: Apt-Install Dependencies @@ -104,7 +104,7 @@ jobs: # Upload Artifacts # - name: Upload Mac ${{ inputs.arch }} artifacts - # if: inputs.os == 'orca-macos-arm64' + # if: inputs.os == 'macos-14' # uses: actions/upload-artifact@v6 # with: # name: OrcaSlicer_dep_mac_${{ env.date }} diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index dbf9d929c7..2af2cac371 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -86,29 +86,29 @@ jobs: # Mac - name: Install tools mac - if: inputs.os == 'orca-macos-arm64' + if: inputs.os == 'macos-14' run: | - # brew install libtool - # brew list + brew install libtool + brew list mkdir -p ${{ github.workspace }}/deps/build - # - name: Free disk space - # if: inputs.os == 'orca-macos-arm64' - # run: | - # df -hI /dev/disk3s1s1 - # sudo find /Applications -maxdepth 1 -type d -name "Xcode_*.app" ! -name "Xcode_15.4.app" -exec rm -rf {} + - # sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/* - # df -hI /dev/disk3s1s1 + - name: Free disk space + if: inputs.os == 'macos-14' + run: | + df -hI /dev/disk3s1s1 + sudo find /Applications -maxdepth 1 -type d -name "Xcode_*.app" ! -name "Xcode_15.4.app" -exec rm -rf {} + + sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/* + df -hI /dev/disk3s1s1 - name: Build slicer mac - if: inputs.os == 'orca-macos-arm64' + if: inputs.os == 'macos-14' working-directory: ${{ github.workspace }} run: | - ./build_release_macos.sh -s -n -x -a universal -t 10.15 + ./build_release_macos.sh -s -n -x -a universal -t 10.15 -1 # Thanks to RaySajuuk, it's working now - name: Sign app and notary - if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'orca-macos-arm64' + if: github.repository == 'OrcaSlicer/OrcaSlicer' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-14' working-directory: ${{ github.workspace }} env: BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} @@ -162,7 +162,7 @@ jobs: fi - name: Create DMG without notary - if: github.ref != 'refs/heads/main' && inputs.os == 'orca-macos-arm64' + if: github.ref != 'refs/heads/main' && inputs.os == 'macos-14' working-directory: ${{ github.workspace }} run: | mkdir -p ${{ github.workspace }}/build/universal/OrcaSlicer_dmg @@ -181,14 +181,14 @@ jobs: fi - name: Upload artifacts mac - if: inputs.os == 'orca-macos-arm64' + if: inputs.os == 'macos-14' uses: actions/upload-artifact@v6 with: name: OrcaSlicer_Mac_universal_${{ env.ver }} path: ${{ github.workspace }}/OrcaSlicer_Mac_universal_${{ env.ver }}.dmg - name: Upload OrcaSlicer_profile_validator DMG mac - if: inputs.os == 'orca-macos-arm64' + if: inputs.os == 'macos-14' uses: actions/upload-artifact@v6 with: name: OrcaSlicer_profile_validator_Mac_universal_DMG_${{ env.ver }} @@ -196,7 +196,7 @@ jobs: if-no-files-found: ignore - name: Deploy Mac release - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'orca-macos-arm64' + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'macos-14' uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label} @@ -207,7 +207,7 @@ jobs: max_releases: 1 # optional, if there are more releases than this matching the asset_name, the oldest ones are going to be deleted - name: Deploy Mac OrcaSlicer_profile_validator DMG release - if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'orca-macos-arm64' + if: github.repository == 'OrcaSlicer/OrcaSlicer' && github.ref == 'refs/heads/main' && inputs.os == 'macos-14' uses: WebFreak001/deploy-nightly@v3.2.0 with: upload_url: https://uploads.github.com/repos/OrcaSlicer/OrcaSlicer/releases/137995723/assets{?name,label}