Cleaned up

.github/actions/build/macos/comfy/action.yml

@@ -0,0 +1,21 @@
+name: Build Comfycli for Macos
+description: Download, install, and set up Comfy 
+runs:
+  using: composite
+  steps:
+    name: Install Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.12'
+      - name: Make Standalone
+        shell: sh
+        run: |
+          python -m pip install --upgrade pip
+          pip install comfy-cli
+          cd assets
+          comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --m-series --skip-manager
+          comfy --workspace ./ComfyUI standalone  --platform macos
+          comfy standalone --rehydrate
+          ls
+#      - name: Sign Wheels
+#        uses: ./.github/actions/build/macos/signwheel

.github/actions/build/macos/signwheel/action.yml

@@ -9,15 +9,11 @@ runs:
         cd ./assets/python/wheels
         find . -name '*.whl' -exec sh -c 'unzip -d "${1%.*}" "$1"' _ {} \;
         find . -name "*.whl" -type f -delete
-    - name: Gather
+    - name: Gather and Sign
       shell: sh
       run: |
         cd ./assets/python/wheels
         find . -name "*so" -o -name "*.dylib" -print0 | while read -d $'\0' file; do codesign --sign 6698D856280DC1662A8E01E5B63428CB6D6651BB --force --timestamp --options runtime --entitlements ../../entitlements.mac.plist "$file"; done
-    - name: Sign
-      shell: sh
-      run: |
-        echo d
     - name: Repack
       shell: sh
       run: |

.github/workflows/publish_macos.yml

@@ -3,9 +3,6 @@ name: Release app
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - rh-mac # just for testing
 
 jobs:
   build-macos:
@@ -25,19 +22,8 @@ jobs:
         with:
           node-version: 20
       - run: npm i
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.12'
-      - name: Make Standalone
-        run: |
-          python -m pip install --upgrade pip
-          pip install comfy-cli
-          cd assets
-          comfy --skip-prompt --workspace ./ComfyUI install --fast-deps --m-series --skip-manager
-          comfy --workspace ./ComfyUI standalone  --platform macos
-          comfy standalone --rehydrate
-          ls
+      - name: Make Comfy
+          uses: ./.github/actions/build/macos/comfy
       - run: |
           SIGN_ID=$(security find-identity -p codesigning -v | grep -E "Developer ID" | sed -n -e 's/.* "/"/p' | tr -d '""')
           echo "SIGN_ID=$SIGN_ID" >> $GITHUB_ENV

scripts/shim.sh

@@ -1,4 +1 @@
 cp -f scripts/shims/utils.js node_modules/@electron/osx-sign/dist/cjs/util.js
-cp -f scripts/shims/mac.js node_modules/@electron/packager/dist/mac.js
-
-cat node_modules/@electron/osx-sign/dist/cjs/util.js