diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 58b4f3fa7ea..71c7c122034 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -46,7 +46,7 @@ jobs: # - os: windows-latest # - os: macos-12 # arch: x86_64 - - os: macos-12 + - os: macos-14 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 5b91a0d6c76..52125eb4a85 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-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') && 'PrusaSlicer_dep' || 'destdir' }} + underscore-arch: ${{ inputs.os == 'macos-14' && '_' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing + dash-arch: ${{ inputs.os == 'macos-14' && '-' || ''}}${{ inputs.os == 'macos-14' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing + dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-14') && 'PrusaSlicer_dep' || 'destdir' }} output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} run: | echo cache-key=${{ runner.os }}${{ env.dash-arch }}-cache-Prusaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index b6c3cc11c7a..f3eba23bb1e 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-12' + if: inputs.os == 'macos-14' working-directory: ${{ github.workspace }} run: | brew install cmake git gettext automake texinfo @@ -80,7 +80,7 @@ jobs: # Upload Artifacts - name: Upload Mac ${{ inputs.arch }} artifacts - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-14' uses: actions/upload-artifact@v3 with: name: PrusaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }} diff --git a/.github/workflows/build_prusa.yml b/.github/workflows/build_prusa.yml index 0ed813656d2..f8b25e1df98 100644 --- a/.github/workflows/build_prusa.yml +++ b/.github/workflows/build_prusa.yml @@ -75,7 +75,7 @@ jobs: # Mac - name: Install tools mac - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-14' run: | brew install cmake git gettext tree brew list @@ -84,20 +84,20 @@ jobs: tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/PrusaSlicer_dep_${{inputs.arch}} - name: Build slicer mac - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-14' working-directory: ${{ github.workspace }} run: | ./build_release_macos.sh -s -n -a ${{inputs.arch}} -t 10.15 - name: Create DMG without notary - if: github.ref != 'refs/heads/boss' && inputs.os == 'macos-12' + if: github.ref != 'refs/heads/boss' && inputs.os == 'macos-14' working-directory: ${{ github.workspace }} run: | ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/PrusaSlicer/Applications hdiutil create -volname "PrusaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/PrusaSlicer -ov -format UDZO PrusaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg - name: Upload artifacts mac - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-14' uses: actions/upload-artifact@v3 with: name: PrusaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}