Skip to content

Commit 7a8e815

Browse files
authored
Merge pull request #86 from open-webui/main
refac
2 parents 313c48f + 563d873 commit 7a8e815

2 files changed

Lines changed: 13 additions & 2 deletions

File tree

.github/workflows/release.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ jobs:
107107
security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
108108
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
109109
security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
110+
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
110111
security list-keychain -d user -s $KEYCHAIN_PATH
111112
112113
# ── Platform packaging ──
@@ -126,14 +127,23 @@ jobs:
126127
npx electron-builder --win --${{ matrix.arch }} --publish never
127128
128129
- name: Package for macOS (signed + notarized)
129-
if: matrix.os == 'macos-latest'
130+
id: mac_build
131+
if: matrix.os == 'macos-latest' && steps.apple_cert.outcome == 'success'
132+
continue-on-error: true
130133
env:
131134
APPLE_ID: ${{ secrets.APPLE_ID }}
132135
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
133136
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
134-
ELECTRON_BUILDER_BINARIES_MIRROR: https://github.com/electron-userland/electron-builder-binaries/releases/download/
135137
run: npx electron-builder --mac --${{ matrix.arch }} -c.mac.identity=auto -c.mac.notarize=true --publish never
136138

139+
- name: Package for macOS (unsigned fallback)
140+
if: matrix.os == 'macos-latest' && (steps.apple_cert.outcome != 'success' || steps.mac_build.outcome == 'failure')
141+
env:
142+
CSC_IDENTITY_AUTO_DISCOVERY: 'false'
143+
run: |
144+
rm -rf dist/
145+
npx electron-builder --mac --${{ matrix.arch }} --publish never
146+
137147
- name: Package for Linux
138148
if: matrix.os == 'ubuntu-latest'
139149
run: |

electron-builder.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ mac:
2626
target:
2727
- dmg
2828
- zip
29+
entitlements: build/entitlements.mac.plist
2930
entitlementsInherit: build/entitlements.mac.plist
3031
extendInfo:
3132
- NSCameraUsageDescription: Application requests access to the device's camera.

0 commit comments

Comments
 (0)