From 75c4b67788c398fe87c86c7ebdcc36de055fd3a7 Mon Sep 17 00:00:00 2001 From: Kendal Cormany Date: Sun, 8 Sep 2024 16:49:16 -0700 Subject: [PATCH] Move Entitlements out of assets folder entitlements should not be packaged into built app --- .github/actions/build/macos/signwheel/action.yml | 2 +- forge.config.ts | 4 ++-- {assets => scripts}/entitlements.mac.plist | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename {assets => scripts}/entitlements.mac.plist (100%) diff --git a/.github/actions/build/macos/signwheel/action.yml b/.github/actions/build/macos/signwheel/action.yml index ccd5e668..2625e44b 100644 --- a/.github/actions/build/macos/signwheel/action.yml +++ b/.github/actions/build/macos/signwheel/action.yml @@ -13,7 +13,7 @@ runs: 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 + find . -name "*so" -o -name "*.dylib" -print0 | while read -d $'\0' file; do codesign --sign 6698D856280DC1662A8E01E5B63428CB6D6651BB --force --timestamp --options runtime --entitlements ../../../scripts/entitlements.mac.plist "$file"; done - name: Repack shell: sh run: | diff --git a/forge.config.ts b/forge.config.ts index cb13626a..d0fff285 100644 --- a/forge.config.ts +++ b/forge.config.ts @@ -23,7 +23,7 @@ const config: ForgeConfig = { osxSign: { identity: process.env.SIGN_ID, optionsForFile: (filepath) => { - return { entitlements: './assets/entitlements.mac.plist' }; + return { entitlements: './scripts/entitlements.mac.plist' }; } }, osxNotarize: { @@ -32,7 +32,7 @@ const config: ForgeConfig = { teamId: process.env.APPLE_TEAM_ID }, }, - extraResource: ['./assets/UI', './assets/ComfyUI', './assets/python.tgz'], + extraResource: ['./assets'], icon: process.platform === 'linux' ? 'assets/UI/Comfy_Logo_x128.png' : 'assets/UI/Comfy_Logo', }, diff --git a/assets/entitlements.mac.plist b/scripts/entitlements.mac.plist similarity index 100% rename from assets/entitlements.mac.plist rename to scripts/entitlements.mac.plist