[TASK] Use GitHub MacOS 13 runner for x86

mjonuschat · Nov 21, 2024 · 906cd1b · 906cd1b
1 parent 065dc23
commit 906cd1b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -49,7 +49,7 @@ jobs:
           - os: ubuntu-22.04
           - os: macos-14
             arch: arm64
-          - os: macos-12
+          - os: macos-13
             arch: x86_64
           - os: windows-latest
     uses: ./.github/workflows/build_check_cache.yml

diff --git 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-13' || inputs.os == 'macos-14') && '_' || ''}}${{ (inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14') && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
-          dash-arch: ${{ (inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14') && '-' || ''}}${{ (inputs.os == 'macos-12' || inputs.os == 'macos-13' || 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-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14') && 'PrusaSlicer_dep' || 'destdir' }}
+          underscore-arch: ${{ (inputs.os == 'macos-13' || inputs.os == 'macos-14') && '_' || ''}}${{ (inputs.os == 'macos-13' || inputs.os == 'macos-14') && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
+          dash-arch: ${{ (inputs.os == 'macos-13' || inputs.os == 'macos-14') && '-' || ''}}${{ (inputs.os == 'macos-13' || 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-13' || 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
@@ -69,7 +69,7 @@ jobs:
             cd ${{ github.workspace }}/deps/build
 
       - name: Build on Mac ${{ inputs.arch }}
-        if: inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14'
+        if: inputs.os == 'macos-13' || inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         run: |
             brew remove -f automake
@@ -79,7 +79,7 @@ jobs:
             mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
             mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/PrusaSlicer_dep_${{ inputs.arch }}
             brew uninstall --ignore-dependencies zstd
-            ./build_release_macos.sh -dp -a ${{ inputs.arch }} -t 10.15
+            ./build_release_macos.sh -dp -a ${{ inputs.arch }} -t 11.3
             brew install zstd
 
       - name: Build on Ubuntu
@@ -98,7 +98,7 @@ jobs:
 
       # Upload Artifacts
       - name: Upload Mac ${{ inputs.arch }} artifacts
-        if: inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14'
+        if: inputs.os == 'macos-13' || inputs.os == 'macos-14'
         uses: actions/upload-artifact@v4
         with:
           name: PrusaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}

diff --git a/.github/workflows/build_prusa.yml b/.github/workflows/build_prusa.yml
@@ -74,21 +74,21 @@ jobs:
 
 #   Mac
       - name: Install tools mac
-        if: inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14'
+        if: inputs.os == 'macos-13' || inputs.os == 'macos-14'
         run: |
           brew install git gettext automake texinfo tree
           mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
           mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/PrusaSlicer_dep_${{inputs.arch}}
           tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/PrusaSlicer_dep_${{inputs.arch}}
 
       - name: Build slicer mac
-        if: inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14'
+        if: inputs.os == 'macos-13' || inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         run: |
-          ./build_release_macos.sh -s -n -a ${{inputs.arch}} -t 10.15
+          ./build_release_macos.sh -s -n -a ${{inputs.arch}} -t 11.3
 
       - name: Sign app and notary
-        if: (github.ref == 'refs/heads/boss' || startsWith(github.ref, 'refs/heads/release/')) && (inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14')
+        if: (github.ref == 'refs/heads/boss' || startsWith(github.ref, 'refs/heads/release/')) && (inputs.os == 'macos-13' || inputs.os == 'macos-14')
         working-directory: ${{ github.workspace }}
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@@ -98,7 +98,7 @@ jobs:
         run: |
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode > $CERTIFICATE_PATH
           security create-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
           security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
           security unlock-keychain -p $KEYCHAIN_PASSWORD $KEYCHAIN_PATH
@@ -114,14 +114,14 @@ jobs:
           xcrun stapler staple PrusaSlicer-${{ env.ver }}+MacOS-${{inputs.arch}}-${{ env.date }}.dmg
 
       - name: Create DMG without notary
-        if: (github.ref != 'refs/heads/boss' && !startsWith(github.ref, 'refs/heads/release/')) && (inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14')
+        if: (github.ref != 'refs/heads/boss' && !startsWith(github.ref, 'refs/heads/release/')) && (inputs.os == 'macos-13' || 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-${{ env.ver }}+MacOS-${{inputs.arch}}-${{ env.date }}.dmg
 
       - name: Upload artifacts mac
-        if: inputs.os == 'macos-12' || inputs.os == 'macos-13' || inputs.os == 'macos-14'
+        if: inputs.os == 'macos-13' || inputs.os == 'macos-14'
         uses: actions/upload-artifact@v4
         with:
           name: PrusaSlicer-${{ env.ver }}+MacOS-${{inputs.arch}}-${{ env.date }}