build: minor fixes to notarize.sh and getversion.sh#1267
build: minor fixes to notarize.sh and getversion.sh#1267Wpc-121 wants to merge 2 commits intoActivityWatch:masterfrom
Conversation
修复notarization_method未正确设置的问题,将altool检查逻辑移至else块中
Greptile SummaryThis PR makes two targeted improvements to the macOS build/notarization scripts. In Confidence Score: 4/5Safe to merge once the open dev-build version format concern (from previous thread) is addressed. The notarize.sh fix is a clear correctness improvement with no new issues. The dynamic version in build_app_tauri.sh is better than a hardcoded placeholder, but the CFBundleShortVersionString/CFBundleVersion validity for dev builds (non-numeric suffix) remains an open P1 flagged in the previous review thread and is not yet resolved in this PR. scripts/package/build_app_tauri.sh — CFBundleShortVersionString and CFBundleVersion validity on dev builds. Important Files Changed
Flowchart%%{init: {'theme': 'neutral'}}%%
flowchart TD
A[notarize.sh starts] --> B{xcrun notarytool available?}
B -- Yes --> C[notarization_method = run_notarytool]
B -- No --> D{xcrun altool available?}
D -- Yes --> E[notarization_method = run_altool]
D -- No --> F[notarization_method = exit]
C --> G{method == exit?}
E --> G
F --> G
G -- Yes --> H[Exit with error]
G -- No --> I[Notarize .app and .dmg]
I --> J[run_stapler]
Reviews (2): Last reviewed commit: "build(tauri): 从getversion.sh获取版本号并移除v前缀" | Re-trigger Greptile |
| VERSION="0.1.0" | ||
| SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" | ||
| VERSION_WITH_V="$("$SCRIPT_DIR/getversion.sh")" | ||
| VERSION="$(echo "$VERSION_WITH_V" | sed -e 's/^v//')" |
There was a problem hiding this comment.
Dev-build VERSION invalid for CFBundleShortVersionString
When the repo is not on an exact tag, getversion.sh outputs a version like v0.13.0.dev-abc1234, which after stripping v becomes 0.13.0.dev-abc1234. Apple's CFBundleShortVersionString must consist of 1–3 period-separated integers (e.g. 0.13.0). A non-numeric suffix can cause codesign/notarization warnings or failures on dev builds.
|
Changes to notarize merged in #1266, this would need to be rebased. |
|
Clean up your existing PRs, don't spam more. Don't use noisy titles. |
No description provided.