diff --git a/.github/workflows/build-workspace.yml b/.github/workflows/build-workspace.yml index b004b70..10da3a9 100644 --- a/.github/workflows/build-workspace.yml +++ b/.github/workflows/build-workspace.yml @@ -187,20 +187,20 @@ jobs: - name: Build After Effects plugin run: cargo xtask macos-ae-plugin --macos-universal --release --destdir=build/ntsc-rs-afterfx - - name: Create .dmg images for bundles + - name: Create .pkg installers for bundles run: | - hdiutil create -srcfolder build/ntsc-rs-standalone -volname "NTSC-rs (App)" -fs HFS+ build/ntsc-rs-standalone.dmg - hdiutil create -srcfolder build/ntsc-rs-openfx -volname "NTSC-rs (OpenFX)" -fs HFS+ build/ntsc-rs-openfx.dmg - hdiutil create -srcfolder build/ntsc-rs-afterfx -volname "NTSC-rs (After Effects)" -fs HFS+ build/ntsc-rs-afterfx.dmg + pkgbuild --install-location /Applications --component build/ntsc-rs-standalone/ntsc-rs.app --min-os-version $MACOSX_DEPLOYMENT_TARGET --compression latest build/ntsc-rs-macos-standalone.pkg + pkgbuild --install-location /Library/OFX/Plugins --component build/ntsc-rs-openfx/NtscRs.ofx.bundle --min-os-version $MACOSX_DEPLOYMENT_TARGET --compression latest build/ntsc-rs-macos-openfx.pkg + pkgbuild --install-location "/Library/Application Support/Adobe/Common/Plug-ins/7.0/MediaCore" --component build/ntsc-rs-afterfx/ntsc-rs.plugin --min-os-version $MACOSX_DEPLOYMENT_TARGET --compression latest build/ntsc-rs-macos-afterfx.pkg - - name: Archive .dmg bundles + - name: Archive .pkg installers uses: actions/upload-artifact@v4 # if: ${{ github.ref_type == 'tag' }} with: name: ntsc-rs-macos - path: build/ntsc-rs-*.dmg + path: build/ntsc-rs-*.pkg - # TODO: sign bundles (necessary for AE?) + # TODO: sign bundles release: runs-on: ubuntu-latest @@ -208,6 +208,7 @@ jobs: contents: write needs: - build-windows + - build-macos - build-linux if: ${{ github.ref_type == 'tag' }} @@ -220,8 +221,10 @@ jobs: with: path: ./artifacts - - name: Zip artifacts - run: for dir in */; do zip -r "${dir%/}.zip" "${dir%/}"; done + - name: Zip Windows/Linux artifacts + run: | + shopt -s extglob + for dir in ntsc-rs-@(windows|linux)*/; do zip -r "${dir%/}.zip" "${dir%/}"; done working-directory: ./artifacts - name: Display structure of downloaded files @@ -231,5 +234,5 @@ jobs: - name: Create release uses: ncipollo/release-action@v1 with: - artifacts: "./artifacts/ntsc-rs-*-standalone.zip,./artifacts/ntsc-rs-*-openfx.zip,./artifacts/ntsc-rs-*-afterfx.zip,./artifacts/ntsc-rs-*.dmg" + artifacts: "./artifacts/ntsc-rs-*-standalone.zip,./artifacts/ntsc-rs-*-openfx.zip,./artifacts/ntsc-rs-*-afterfx.zip,./artifacts/ntsc-rs-macos/*.pkg" draft: true