From fedd2bd1d03448bb9f7d8cc8d34917f8451eff39 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 26 Dec 2023 21:09:58 +0800 Subject: [PATCH] downgrade to macos-12 as there are not many macos-13 runner instances availble yet --- .github/workflows/build_all.yml | 4 ++-- .github/workflows/build_check_cache.yml | 6 +++--- .github/workflows/build_deps.yml | 4 ++-- .github/workflows/build_orca.yml | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index a6141efff7b..a45d336f86c 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -46,9 +46,9 @@ jobs: include: - os: ubuntu-20.04 - os: windows-latest - - os: macos-13 + - os: macos-12 arch: x86_64 - - os: macos-13 + - os: macos-12 arch: arm64 uses: ./.github/workflows/build_check_cache.yml with: diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index b8013a5eaf9..cccc0849443 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -28,9 +28,9 @@ jobs: - name: set outputs id: set_outputs env: - underscore-arch: ${{ inputs.os == 'macos-13' && '_' || ''}}${{ inputs.os == 'macos-13' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing - dash-arch: ${{ inputs.os == 'macos-13' && '-' || ''}}${{ inputs.os == 'macos-13' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing - dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-13') && 'OrcaSlicer_dep' || 'destdir' }} + underscore-arch: ${{ inputs.os == 'macos-12' && '_' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing + dash-arch: ${{ inputs.os == 'macos-12' && '-' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing + dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-12') && 'OrcaSlicer_dep' || 'destdir' }} output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} run: | echo cache-key=${{ runner.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 0357d1c5432..f7a16b7b610 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -67,7 +67,7 @@ jobs: cd ${{ github.workspace }}/deps/build - name: Build on Mac ${{ inputs.arch }} - if: inputs.os == 'macos-13' + if: inputs.os == 'macos-12' working-directory: ${{ github.workspace }} run: | brew install cmake git gettext automake @@ -98,7 +98,7 @@ jobs: # Upload Artifacts - name: Upload Mac ${{ inputs.arch }} artifacts - if: inputs.os == 'macos-13' + if: inputs.os == 'macos-12' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }} diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index ac558acefd3..b629f27de2c 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -74,7 +74,7 @@ jobs: # Mac - name: Install tools mac - if: inputs.os == 'macos-13' + if: inputs.os == 'macos-12' run: | brew install cmake git gettext tree brew uninstall --ignore-dependencies zstd @@ -84,14 +84,14 @@ jobs: tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}} - name: Build slicer mac - if: inputs.os == 'macos-13' + if: inputs.os == 'macos-12' working-directory: ${{ github.workspace }} run: | ./build_release_macos.sh -s -n -a ${{inputs.arch}} # Thanks to RaySajuuk, it's working now - name: Sign app and notary - if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-13' + if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-12' working-directory: ${{ github.workspace }} env: BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} @@ -117,14 +117,14 @@ jobs: xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg - name: Create DMG without notary - if: github.ref != 'refs/heads/main' && inputs.os == 'macos-13' + if: github.ref != 'refs/heads/main' && inputs.os == 'macos-12' working-directory: ${{ github.workspace }} run: | ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg - name: Upload artifacts mac - if: inputs.os == 'macos-13' + if: inputs.os == 'macos-12' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}