Merge branch 'mac/nativeStaple' into HEAD

ann0see · Aug 22, 2024 · 4854f4b · 4854f4b
2 parents b18ff5d + 8268f97
commit 4854f4b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/autobuild/mac.sh b/.github/autobuild/mac.sh
@@ -206,6 +206,11 @@ notarize() {
         --wait
 }
 
+staple() {
+    echo "Stapling package..."
+    xcrun stapler staple "${product-path}"
+}
+
 case "${1:-}" in
     setup)
         setup
@@ -219,8 +224,11 @@ case "${1:-}" in
     notarize)
         notarize
         ;;
+    staple)
+        staple
+        ;;
     *)
         echo "Unknown stage '${1:-}'"
         exit 1
         ;;
-esac
+esac
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -422,8 +422,9 @@ jobs:
                                     needs.create_release.outputs.publish_to_release == 'true' &&
                                     steps.build.outputs.macos_notarize == 'true'
         id:                         staple-macOS-app
-        uses:                       BoundfoxStudios/action-xcode-staple@cd6c16fb6a3dfb365203a41343926f81e813afad
-        with:
+        run:                        ${{ matrix.config.base_command }} staple
+        env:
+          JAMULUS_BUILD_VERSION:    ${{ needs.create_release.outputs.build_version }}
           product-path:             deploy/${{ steps.get-artifacts.outputs.artifact_1 }}
 
       - name:                       Deploy Artifacts to Release