Skip to content

armgit / peach

Public Imported from GitHub
0

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

fix(ci): 补齐 Linux 回归环境与原生 Shell 判定

longmeidaod08587006c37
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 133e70aab..53f62ac5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ verify-linux:
paths: [.uv-cache/, .npm/]
before_script:
- apt-get update
- - apt-get install -y --no-install-recommends python3-pip chromium ffmpeg
+ - apt-get install -y --no-install-recommends python3-pip chromium ffmpeg xvfb xauth
- python3 -m pip install --break-system-packages uv==0.13.3
- uv sync --locked --all-extras --python 3.14
- npm ci --ignore-scripts --prefer-offline
@@ -48,7 +48,7 @@ verify-linux:
- test -z "$(git status --porcelain --untracked-files=all -- web/dist)"
- uv run --locked python scripts/npm_audit.py
- uv run --locked python scripts/npm_audit.py --prefix frontend
- - ./scripts/test.sh full --fresh
+ - xvfb-run -a ./scripts/test.sh full --fresh
artifacts:
when: always
expire_in: 14 days
diff --git a/scripts/changelog.py b/scripts/changelog.py
index 5e634e158..9f55a8e7c 100644
--- a/scripts/changelog.py
+++ b/scripts/changelog.py
@@ -39,9 +39,11 @@ UNRELEASED = "未发布"
#: Release 页正文里跟在变更日志后面的安装提示。每一版都一样,所以只写在这里一处,
#: 工作流不再自己抄一份。
-INSTALL_NOTE = ("Windows x64,支持本机和局域网浏览器访问;无需另装 Python 或媒体工具。"
+INSTALL_NOTE = ("Windows x64 提供安装包与免安装包,包内含 Python 与媒体工具;"
+ "macOS 提供 Apple Silicon 与 Intel DMG,媒体工具需另行准备。"
+ "macOS 测试包使用本地 ad-hoc 签名,未完成 Apple 公证。"
"安装与使用见 [Windows 使用说明](https://github.com/peach-mitao/peach/blob/master/docs/TESTING_DESKTOP.md),"
- "macOS 见 [源码运行](https://github.com/peach-mitao/peach/blob/master/docs/OPERATIONS.md#从源码运行windowsmacos)。")
+ "macOS 见 [macOS 使用说明](https://github.com/peach-mitao/peach/blob/master/docs/OPERATIONS.md)。")
#: Conventional Commits 的主题形状:`type(scope)!: 描述`。
SUBJECT = re.compile(r"^(?P<type>[a-z]+)(?:\((?P<scope>[^)]*)\))?(?P<bang>!)?:\s*(?P<text>.+)$")
diff --git a/tests/test_scripts.py b/tests/test_scripts.py
index 70722ce0f..c56136a29 100644
--- a/tests/test_scripts.py
+++ b/tests/test_scripts.py
@@ -1851,7 +1851,7 @@ class OperationalScriptTests(unittest.TestCase):
continue
probe = subprocess.run([path, "-c", "uname -s"],
capture_output=True, text=True, encoding="utf-8", check=False)
- if probe.returncode == 0 and "linux" not in probe.stdout.casefold():
+ if probe.returncode == 0 and (sys.platform != "win32" or "linux" not in probe.stdout.casefold()):
shells.append(path)
self.assertTrue(shells)
for shell in dict.fromkeys(shells):