Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(ci): lipo 架构校验把输入文件写在操作之前

longmeidao006454c5590b
diff --git a/scripts/build_macos_media.py b/scripts/build_macos_media.py
index 668aa76a8..b2e0f1718 100644
--- a/scripts/build_macos_media.py
+++ b/scripts/build_macos_media.py
@@ -23,7 +23,8 @@ def run(args, cwd, env):
def audit_binary(path: Path, architecture: str) -> None:
"""拒绝其他架构及开发机动态库,系统库由 macOS 提供。"""
- subprocess.run(["lipo", "-verify_arch", architecture, str(path)], check=True)
+ # Xcode 16 的 lipo 要求输入文件写在操作之前,旧版两种顺序都接受。
+ subprocess.run(["lipo", str(path), "-verify_arch", architecture], check=True)
output = subprocess.check_output(["otool", "-L", str(path)], text=True, encoding="utf-8")
for line in output.splitlines()[1:]:
dependency = line.strip().split(" (", 1)[0]
diff --git a/scripts/ci_macos.sh b/scripts/ci_macos.sh
index 8ffe0c269..b893540de 100644
--- a/scripts/ci_macos.sh
+++ b/scripts/ci_macos.sh
@@ -122,7 +122,7 @@ test -s "$mountpoint/Peach.app/Contents/Resources/LICENSE"
"$python" -c 'import json,sys; config=json.load(open(sys.argv[1],encoding="utf-8")); assert config["dsn"] and config["library_dsn"], "包内 sentry.json 缺 DSN"' \
"$mountpoint/Peach.app/Contents/Resources/sentry.json"
codesign --verify --deep --strict "$mountpoint/Peach.app"
-lipo -verify_arch "$architecture" "$mountpoint/Peach.app/Contents/MacOS/Peach"
+lipo "$mountpoint/Peach.app/Contents/MacOS/Peach" -verify_arch "$architecture"
"$python" scripts/smoke_macos.py "$mountpoint/Peach.app"
"$python" scripts/smoke_macos_media.py "$mountpoint/Peach.app" --arch "$architecture"
(cd "$output"; shasum -a 256 "${image##*/}" *-corresponding-source.zip > SHA256SUMS.txt)