diff options
| author | supermerill <merill@free.fr> | 2022-08-08 01:33:36 +0300 |
|---|---|---|
| committer | supermerill <merill@free.fr> | 2022-08-10 03:15:34 +0300 |
| commit | 3edd7b2e9345054f85623d73efaba46b9e737ca6 (patch) | |
| tree | 870e87e31d78638844246c4f3b7cb28d8093940a | |
| parent | 3b62b1979ffce95632597e7af7c1c554948aaf8f (diff) | |
update mac intel build to include zstd
| -rw-r--r-- | .github/workflows/ccpp_mac.yml | 18 | ||||
| -rw-r--r-- | .github/workflows/ccpp_mac_debug.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/ccpp_mac_rc.yml | 7 |
3 files changed, 26 insertions, 13 deletions
diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 96307453f..b198e85a7 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -11,19 +11,27 @@ on: jobs: build: - runs-on: macos-10.15 + runs-on: macos-12 steps: - uses: actions/checkout@v3 - name: build deps & slicer - run: ./BuildMacOS.sh -i + run: ./BuildMacOS.sh + - name: copy zstd + run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib + - name: relink zstd + run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }} + - name: create the dmg + run: | + hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder "build/pack/${{ github.event.repository.name }}" temp.dmg + hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: - name: nightly_macos.tar - path: build/SuperSlicer.tar + name: nightly_macos.app + path: build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: name: nightly_macos.dmg - path: build/SuperSlicer.dmg + path: ${{ github.event.repository.name }}.dmg diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml index ede4c4083..f43b8296a 100644 --- a/.github/workflows/ccpp_mac_debug.yml +++ b/.github/workflows/ccpp_mac_debug.yml @@ -8,14 +8,22 @@ on: jobs: build: - runs-on: macos-11 + runs-on: macos-12 steps: - uses: actions/checkout@v2 with: ref: 'debug_macos' - name: build deps & slicer - run: ./BuildMacOS.sh -bi + run: ./BuildMacOS.sh -b + - name: copy zstd + run: cp /usr/local/opt/zstd/lib/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/libzstd.1.dylib + - name: relink zstd + run: install_name_tool -change /usr/local/opt/zstd/lib/libzstd.1.dylib @executable_path/libzstd.1.dylib ./build/pack/${{ github.event.repository.name }}/${{ github.event.repository.name }}.app/Contents/MacOS/${{ github.event.repository.name }} + - name: create the dmg + run: | + hdiutil create -ov -fs HFS+ -volname ${{ github.event.repository.name }} -srcfolder build/pack/${{ github.event.repository.name }} temp.dmg + hdiutil convert temp.dmg -format UDZO -o ${{ github.event.repository.name }}.dmg - name: tar the pack working-directory: ./build run: ls @@ -28,4 +36,4 @@ jobs: uses: actions/upload-artifact@v1.0.0 with: name: nightly_macos.tar - path: build/${{ github.event.repository.name }}.tar + path: ${{ github.event.repository.name }}.tar diff --git a/.github/workflows/ccpp_mac_rc.yml b/.github/workflows/ccpp_mac_rc.yml index 51da52c48..2e3d904d0 100644 --- a/.github/workflows/ccpp_mac_rc.yml +++ b/.github/workflows/ccpp_mac_rc.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: macos-latest + runs-on: macos-12 steps: - uses: actions/checkout@v2 @@ -25,7 +25,7 @@ jobs: env: MACOS_CERTIFICATE: ${{ secrets.MACOS_P12 }} MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_PASSWD }} - MACOS_APP: ${{secret.MAC_APP_PWD}} + MACOS_APP: ${{ secrets.MAC_APP_PWD }} run: | echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12 security create-keychain -p temp_password build.keychain @@ -65,9 +65,6 @@ jobs: with: name: rc_macos.app path: build/pack/SuperSlicer/SuperSlicer.app - - name: run codesign on dmg - run: | - /usr/bin/codesign --force -s "Developer ID Application: Remi Durand (LDTLFRHP3G)" ./build/SuperSlicer.dmg -v - name: Upload artifact uses: actions/upload-artifact@v1.0.0 with: |