Skip to content

Commit bd5dcb8

Browse files
author
baiqing
committed
chore(release): bump version to 1.3.4-8 (Beta) + fcitx5 路径抓取/安装前缀修复
v1.3.4-7 显示:fcitx5 包名替换后构建本身已成功([100%] Built target openless), 但下一步立刻 exit 1。根因有两个: 1) cmake -LA 抓不到值 fcitx5 5.0.14 把 FCITX_INSTALL_ADDONDIR / FCITX_INSTALL_PKGDATADIR 设为普通变量而非 CACHE,cmake -LA 看不到 → grep 退码 1 → set -e -o pipefail 触发整步退出。 改从 configure 阶段 message(STATUS ...) 的输出抓(CMakeLists.txt 已经打印)。 2) CMAKE_INSTALL_PREFIX 默认 /usr/local 路径错 fcitx5 在 Ubuntu 上运行时只扫 /usr/lib/<arch>/fcitx5/,默认 prefix=/usr/local 会让 .deb 把插件安到 /usr/local/lib/fcitx5/,运行时找不到。 显式 -DCMAKE_INSTALL_PREFIX=/usr 强制 Debian 系标准路径。 历史 v1.3.4-3 其实也是这条 bug 路径,只是 cmake -LA 那行先挂掉没人意识到。 提取失败时打印 cmake-configure.log 末 50 行作为诊断。
1 parent 9bae92b commit bd5dcb8

6 files changed

Lines changed: 24 additions & 14 deletions

File tree

.github/workflows/release-tauri.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -376,15 +376,25 @@ jobs:
376376
exit 1
377377
fi
378378
mkdir -p build && cd build
379-
cmake .. 2>&1
379+
# 显式 CMAKE_INSTALL_PREFIX=/usr:fcitx5 在 Ubuntu 上的运行时插件搜索
380+
# 路径是 /usr/lib/<arch>/fcitx5/,默认 prefix=/usr/local 会让 .deb 把
381+
# 插件安到 /usr/local/lib/fcitx5/,fcitx5 永远找不到。
382+
# 历史上 v1.3.4-3 也是这条 bug 路径,只是 cmake -LA 那行先挂掉,没人意识到。
383+
cmake .. -DCMAKE_INSTALL_PREFIX=/usr 2>&1 | tee cmake-configure.log
380384
make
381-
# 从 cmake 缓存中读出 distro 实际的插件安装路径(multiarch 感知)。
382-
FCITX_ADDON_DIR=$(cmake -LA . 2>/dev/null \
383-
| grep "^FCITX_INSTALL_ADDONDIR:" \
384-
| cut -d= -f2)
385-
FCITX_PKGDATA_DIR=$(cmake -LA . 2>/dev/null \
386-
| grep "^FCITX_INSTALL_PKGDATADIR:" \
387-
| cut -d= -f2)
385+
# v1.3.4-7 暴露:fcitx5 5.0.14 把 FCITX_INSTALL_* 设为普通变量而非 CACHE,
386+
# `cmake -LA` 抓不到 → grep 退码 1 → set -e -o pipefail 整步退出。
387+
# 改从 configure 阶段 message(STATUS ...) 的输出抓(CMakeLists.txt 已经打印)。
388+
FCITX_ADDON_DIR=$(grep "FCITX_INSTALL_ADDONDIR:" cmake-configure.log \
389+
| tail -1 | sed -E 's/^[^:]*: ([^ ]+).*/\1/')
390+
FCITX_PKGDATA_DIR=$(grep "FCITX_INSTALL_PKGDATADIR:" cmake-configure.log \
391+
| tail -1 | sed -E 's/^[^:]*: ([^ ]+).*/\1/')
392+
if [ -z "$FCITX_ADDON_DIR" ] || [ -z "$FCITX_PKGDATA_DIR" ]; then
393+
echo "::error::Failed to extract FCITX_INSTALL_* paths from cmake configure log"
394+
echo "--- cmake-configure.log (last 50 lines) ---"
395+
tail -50 cmake-configure.log
396+
exit 1
397+
fi
388398
echo "Detected: addon=$FCITX_ADDON_DIR pkgdata=$FCITX_PKGDATA_DIR"
389399
echo "FCITX_ADDON_DIR=$FCITX_ADDON_DIR" >> "$GITHUB_ENV"
390400
echo "FCITX_ADDON_CONF_DIR=${FCITX_PKGDATA_DIR}/addon" >> "$GITHUB_ENV"

openless-all/app/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openless-all/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openless-app",
33
"private": true,
4-
"version": "1.3.4-7",
4+
"version": "1.3.4-8",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

openless-all/app/src-tauri/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

openless-all/app/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "openless"
3-
version = "1.3.4-7"
3+
version = "1.3.4-8"
44
description = "OpenLess — local voice input that types where your cursor is"
55
authors = ["OpenLess"]
66
edition = "2021"

openless-all/app/src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
33
"productName": "OpenLess",
4-
"version": "1.3.4-7",
4+
"version": "1.3.4-8",
55
"identifier": "com.openless.app",
66
"build": {
77
"beforeDevCommand": "npm run dev",

0 commit comments

Comments
 (0)