diff --git a/.github/workflows/release-tauri.yml b/.github/workflows/release-tauri.yml index bf1b89e2..08f4d538 100644 --- a/.github/workflows/release-tauri.yml +++ b/.github/workflows/release-tauri.yml @@ -376,15 +376,25 @@ jobs: exit 1 fi mkdir -p build && cd build - cmake .. 2>&1 + # 显式 CMAKE_INSTALL_PREFIX=/usr:fcitx5 在 Ubuntu 上的运行时插件搜索 + # 路径是 /usr/lib//fcitx5/,默认 prefix=/usr/local 会让 .deb 把 + # 插件安到 /usr/local/lib/fcitx5/,fcitx5 永远找不到。 + # 历史上 v1.3.4-3 也是这条 bug 路径,只是 cmake -LA 那行先挂掉,没人意识到。 + cmake .. -DCMAKE_INSTALL_PREFIX=/usr 2>&1 | tee cmake-configure.log make - # 从 cmake 缓存中读出 distro 实际的插件安装路径(multiarch 感知)。 - FCITX_ADDON_DIR=$(cmake -LA . 2>/dev/null \ - | grep "^FCITX_INSTALL_ADDONDIR:" \ - | cut -d= -f2) - FCITX_PKGDATA_DIR=$(cmake -LA . 2>/dev/null \ - | grep "^FCITX_INSTALL_PKGDATADIR:" \ - | cut -d= -f2) + # v1.3.4-7 暴露:fcitx5 5.0.14 把 FCITX_INSTALL_* 设为普通变量而非 CACHE, + # `cmake -LA` 抓不到 → grep 退码 1 → set -e -o pipefail 整步退出。 + # 改从 configure 阶段 message(STATUS ...) 的输出抓(CMakeLists.txt 已经打印)。 + FCITX_ADDON_DIR=$(grep "FCITX_INSTALL_ADDONDIR:" cmake-configure.log \ + | tail -1 | sed -E 's/^[^:]*: ([^ ]+).*/\1/') + FCITX_PKGDATA_DIR=$(grep "FCITX_INSTALL_PKGDATADIR:" cmake-configure.log \ + | tail -1 | sed -E 's/^[^:]*: ([^ ]+).*/\1/') + if [ -z "$FCITX_ADDON_DIR" ] || [ -z "$FCITX_PKGDATA_DIR" ]; then + echo "::error::Failed to extract FCITX_INSTALL_* paths from cmake configure log" + echo "--- cmake-configure.log (last 50 lines) ---" + tail -50 cmake-configure.log + exit 1 + fi 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" diff --git a/openless-all/app/package-lock.json b/openless-all/app/package-lock.json index 7110b628..353a0132 100644 --- a/openless-all/app/package-lock.json +++ b/openless-all/app/package-lock.json @@ -1,12 +1,12 @@ { "name": "openless-app", - "version": "1.3.4-7", + "version": "1.3.4-8", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "openless-app", - "version": "1.3.4-7", + "version": "1.3.4-8", "dependencies": { "@tauri-apps/api": "^2.1.1", "@tauri-apps/plugin-autostart": "^2.5.1", diff --git a/openless-all/app/package.json b/openless-all/app/package.json index 476016a7..a00aade5 100644 --- a/openless-all/app/package.json +++ b/openless-all/app/package.json @@ -1,7 +1,7 @@ { "name": "openless-app", "private": true, - "version": "1.3.4-7", + "version": "1.3.4-8", "type": "module", "scripts": { "dev": "vite", diff --git a/openless-all/app/src-tauri/Cargo.lock b/openless-all/app/src-tauri/Cargo.lock index 958fa6c7..53d0ec97 100644 --- a/openless-all/app/src-tauri/Cargo.lock +++ b/openless-all/app/src-tauri/Cargo.lock @@ -3666,7 +3666,7 @@ dependencies = [ [[package]] name = "openless" -version = "1.3.4-7" +version = "1.3.4-8" dependencies = [ "anyhow", "arboard", diff --git a/openless-all/app/src-tauri/Cargo.toml b/openless-all/app/src-tauri/Cargo.toml index 55cd8698..82fc9c68 100644 --- a/openless-all/app/src-tauri/Cargo.toml +++ b/openless-all/app/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "openless" -version = "1.3.4-7" +version = "1.3.4-8" description = "OpenLess — local voice input that types where your cursor is" authors = ["OpenLess"] edition = "2021" diff --git a/openless-all/app/src-tauri/tauri.conf.json b/openless-all/app/src-tauri/tauri.conf.json index 5f561162..f66bf654 100644 --- a/openless-all/app/src-tauri/tauri.conf.json +++ b/openless-all/app/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "OpenLess", - "version": "1.3.4-7", + "version": "1.3.4-8", "identifier": "com.openless.app", "build": { "beforeDevCommand": "npm run dev",