Skip to content

windows适配和mac安装问题 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caidesen merged 2 commits into from
Oct 23, 2026
Merged

windows适配和mac安装问题 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
439e65c
fix: 适配 Windows 侧栏收起按钮布局
caidesen Oct 23, 2026
c82fddb
fix: 为 macOS 安装包添加临时签名与产物校验
caidesen Oct 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/build-desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,21 @@ jobs:
- name: 构建安装包
working-directory: apps/desktop
env:
TARP_CODESIGN: ${{ inputs.sign && secrets.MAC_DEVELOPER_ID != '' && matrix.platform == 'mac' && '1' || '0' }}
TARP_CODESIGN: ${{ matrix.platform == 'mac' && '1' || '0' }}
TARP_NOTARIZE: ${{ inputs.sign && secrets.MAC_DEVELOPER_ID != '' && secrets.APPLE_ID != '' && matrix.platform == 'mac' && '1' || '0' }}
ELECTROBUN_DEVELOPER_ID: ${{ matrix.platform == 'mac' && secrets.MAC_DEVELOPER_ID || '' }}
ELECTROBUN_DEVELOPER_ID: ${{ matrix.platform == 'mac' && (inputs.sign && secrets.MAC_DEVELOPER_ID || '-') || '' }}
ELECTROBUN_APPLEID: ${{ matrix.platform == 'mac' && secrets.APPLE_ID || '' }}
ELECTROBUN_APPLEIDPASS: ${{ matrix.platform == 'mac' && secrets.APPLE_APP_SPECIFIC_PASSWORD || '' }}
ELECTROBUN_TEAMID: ${{ matrix.platform == 'mac' && secrets.APPLE_TEAM_ID || '' }}
run: bun run dist
- name: 校验 macOS DMG 与内部安装器签名
if: runner.os == 'macOS'
run: |
codesign --verify --strict --verbose=2 apps/desktop/release/macos-arm64-TARP.dmg
TARP_DMG_MOUNT=$(mktemp -d "$RUNNER_TEMP/tarp-dmg.XXXXXX")
hdiutil attach apps/desktop/release/macos-arm64-TARP.dmg -readonly -nobrowse -mountpoint "$TARP_DMG_MOUNT"
trap 'hdiutil detach "$TARP_DMG_MOUNT"; rmdir "$TARP_DMG_MOUNT"' EXIT
codesign --verify --deep --strict --verbose=2 "$TARP_DMG_MOUNT/TARP.app"
- name: 验证打包后的 Bun、CLI、模组、Wasm 和 SQLite
run: bun scripts/release/smoke.ts desktop
- uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
Expand Down
16 changes: 10 additions & 6 deletions apps/desktop/src/renderer/src/components/SidebarToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,20 @@ interface SidebarToggleProps {
readonly className?: string;
}

/** 把窗口操作放在原生交通灯旁，避免再拼出一条独立的自定义标题栏。 */
/** macOS 按钮放在交通灯旁；Windows 保留原生标题栏，按钮贴近内容区左侧。 */
export function SidebarToggle({ collapsed, onToggle, className }: SidebarToggleProps) {
const isWindows = navigator.userAgent.includes("Windows");

return (
<>
<div
className="absolute inset-x-0 top-0 z-50 h-12 [-webkit-app-region:drag]"
aria-hidden="true"
/>
{!isWindows ? (
<div
className="absolute inset-x-0 top-0 z-50 h-12 [-webkit-app-region:drag]"
aria-hidden="true"
/>
) : null}
<Button
className={`text-muted-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground absolute top-4 left-20 z-[60] size-8 rounded-lg [-webkit-app-region:no-drag] ${className ?? ""}`}
className={`text-muted-foreground hover:bg-sidebar-accent hover:text-sidebar-accent-foreground absolute top-4 z-[60] size-8 rounded-lg [-webkit-app-region:no-drag] ${isWindows ? "left-4" : "left-20"} ${className ?? ""}`}
variant="ghost"
size="icon"
onClick={onToggle}
Expand Down
4 changes: 3 additions & 1 deletion docs/发布流程.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ git push origin cli-v0.1.0

SQLite 使用内置 `bun:sqlite`，Kysely 通过共享适配器同步访问；不分发 `better-sqlite3`。QuickJS Wasm 及其运行依赖作为外部文件复制，其他依赖参与打包。SQLite 验收覆盖加载、写入、事务回滚和重开恢复，Wasm 验收实际创建 QuickJS 上下文并执行代码。

macOS 签名使用仓库 Secrets `MAC_CSC_LINK`（HTTPS 证书地址或 Base64 P12）、`MAC_CSC_KEY_PASSWORD` 和 `MAC_DEVELOPER_ID`（完整 Developer ID Application 标识）。CI 在临时钥匙串导入证书；`MAC_DEVELOPER_ID` 配置后开启签名。公证使用 `APPLE_ID`、`APPLE_APP_SPECIFIC_PASSWORD`、`APPLE_TEAM_ID`，映射到 Electrobun 的对应环境变量。未配置时生成本地验收包。Hutch 当前不自动签署 Windows 安装器，正式发布前按目标环境补充签名。
macOS Actions 构建始终开启签名。PR 或未配置证书的发布使用免费临时签名身份 `-`；框架在生成更新归档和 DMG 前分别签署真实应用、外层自解压安装器与 DMG，不在归档生成后重新修改应用，避免破坏更新元数据和差分补丁。CI 挂载最终 DMG 校验安装器签名，并从更新归档解出真实应用做签名校验，任一步失败均停止上传。临时签名只保证包的签名完整性，不提供 Apple 开发者身份认证或公证，下载后仍可能受到 Gatekeeper 拦截。

正式签名使用仓库 Secrets `MAC_CSC_LINK`（HTTPS 证书地址或 Base64 P12）、`MAC_CSC_KEY_PASSWORD` 和 `MAC_DEVELOPER_ID`（完整 Developer ID Application 标识）。发布流程在临时钥匙串导入证书，配置 `MAC_DEVELOPER_ID` 后使用正式身份替代临时签名。公证使用 `APPLE_ID`、`APPLE_APP_SPECIFIC_PASSWORD`、`APPLE_TEAM_ID`，映射到 Electrobun 的对应环境变量；无凭据时不提交公证。本机签名仍由 `TARP_CODESIGN`、`TARP_NOTARIZE` 与对应凭据控制。Hutch 当前不自动签署 Windows 安装器，正式发布前按目标环境补充签名。

本机从根目录运行 `bun run dist` 后执行 `bun scripts/release/smoke.ts desktop` 验收稳定包；开发包可使用 `TARP_SMOKE_CHANNEL=dev`。最后一个任务上传以下附件，不自动公开 Release：

Expand Down
4 changes: 4 additions & 0 deletions scripts/release/smoke.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ try {
process.platform === "darwin"
? join(directory, `${appName}.app/Contents`)
: join(directory, appName);
if (process.platform === "darwin" && channel !== "dev") {
await execute("codesign", ["--verify", "--deep", "--strict", "--verbose=2", dirname(bundle)]);
console.log("macOS 更新归档中的应用签名验收通过。");
}
const bin = join(bundle, process.platform === "darwin" ? "MacOS" : "bin");
desktopApp = join(bundle, "Resources/app");
executable = join(bin, process.platform === "win32" ? "bun.exe" : "bun");
Expand Down
Loading