From 088e2ab3d988046d58d40349ff84a364e73fe4b0 Mon Sep 17 00:00:00 2001 From: aeoform <2790848120@qq.com> Date: Sat, 16 May 2026 09:38:21 +0800 Subject: [PATCH] fix(ci): derive RPM fcitx5 plugin path from cmake detection Map Debian multiarch addon dir to /usr/lib64 for RPM packages. Uses FCITX_RPM_ADDON_DIR derived from cmake output instead of hardcoded paths. Co-Authored-By: Claude Opus 4.7 --- .github/workflows/release-tauri.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-tauri.yml b/.github/workflows/release-tauri.yml index a8f2038c..73d59154 100644 --- a/.github/workflows/release-tauri.yml +++ b/.github/workflows/release-tauri.yml @@ -359,6 +359,11 @@ jobs: echo "Detected: addon=$FCITX_ADDON_DIR pkgdata=$FCITX_PKGDATA_DIR" echo "FCITX_ADDON_DIR=$FCITX_ADDON_DIR" >> "$GITHUB_ENV" echo "FCITX_ADDON_CONF_DIR=${FCITX_PKGDATA_DIR}/addon" >> "$GITHUB_ENV" + # 对 RPM 目标映射路径：Debian multiarch（如 /usr/lib/x86_64-linux-gnu） + # -> /usr/lib64（RPM 标准）。conf 路径跨发行版一致。 + RPM_ADDON_DIR=$(echo "$FCITX_ADDON_DIR" \ + | sed 's|/usr/lib/[^/]*/fcitx5|/usr/lib64/fcitx5|;s|/usr/lib/x86_64-linux-gnu/fcitx5|/usr/lib64/fcitx5|') + echo "FCITX_RPM_ADDON_DIR=$RPM_ADDON_DIR" >> "$GITHUB_ENV" # 把插件 .so + .conf 复制到 src-tauri/linux-fcitx5-plugin/ 下面， # 供 tauri deb/rpm bundler 的 files 配置使用。 mkdir -p "$GITHUB_WORKSPACE/openless-all/app/src-tauri/linux-fcitx5-plugin" @@ -392,8 +397,8 @@ jobs: "rpm": { "depends": ["fcitx5", "fcitx5-module-dbus"], "files": { - "/usr/lib64/fcitx5/libopenless.so": "linux-fcitx5-plugin/libopenless.so", - "/usr/share/fcitx5/addon/openless.conf": "linux-fcitx5-plugin/openless.conf" + "${FCITX_RPM_ADDON_DIR}/libopenless.so": "linux-fcitx5-plugin/libopenless.so", + "${FCITX_ADDON_CONF_DIR}/openless.conf": "linux-fcitx5-plugin/openless.conf" } } }