From 86bccaae1610adf5f68b02fafcb75436500fe816 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 8 Jun 2026 21:29:51 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=89=20Sync=202026-06-08=2021:29:51?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- amule/Makefile | 4 ++-- luci-app-openclaw/CHANGELOG.md | 4 ++-- luci-app-openclaw/Makefile | 2 +- luci-app-openclaw/README.md | 2 +- luci-app-openclaw/root/usr/bin/openclaw-env | 4 ++-- luci-app-openclaw/tests/test_node_packaging_contract.sh | 5 +++-- luci-app-openclaw/tests/test_openclaw_contracts.sh | 2 +- luci-app-openclaw/tests/test_openclaw_node.sh | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/amule/Makefile b/amule/Makefile index af93478a6..3c909fcb3 100644 --- a/amule/Makefile +++ b/amule/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=amule -PKG_VERSION:=2.3.3 -PKG_RELEASE:=1 +PKG_VERSION:=3.0.0 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/amule-project/amule/tar.gz/$(PKG_VERSION)? diff --git a/luci-app-openclaw/CHANGELOG.md b/luci-app-openclaw/CHANGELOG.md index ca134c374..002251dde 100644 --- a/luci-app-openclaw/CHANGELOG.md +++ b/luci-app-openclaw/CHANGELOG.md @@ -9,9 +9,9 @@ ### 适配 OpenClaw v2026.6.1 - `OC_TESTED_VERSION` 更新为 `2026.6.1`，默认稳定版跟随 npm `latest` 稳定标签。 -- 默认 Node.js 运行时更新为 `24.15.0`，最低要求同步提升到 `22.19.0`，匹配 OpenClaw 2026.6.x 的 `engines.node`。 +- 默认 Node.js 运行时更新为 Alpine musl LTS `22.22.2`，最低要求同步提升到 `22.19.0`，匹配 OpenClaw 2026.6.x 的 `engines.node`。 - 安装脚本不再从当前 Node 版本静默回退到旧版 V1 tarball，避免下载失败后装入过低 Node.js 并在 OpenClaw 安装后失败。 -- ARM64 musl 预编译 Node.js 构建流程更新为 `24.15.0`，并校验默认路径和自定义安装路径均可运行。 +- ARM64 musl 预编译 Node.js 构建流程改用 Alpine 原生 LTS 包，避免 glibc 二进制转换为 musl 后运行失败，并校验默认路径和自定义安装路径均可运行。 ### 修复安装、控制台与状态体验 diff --git a/luci-app-openclaw/Makefile b/luci-app-openclaw/Makefile index f0acd0590..64aa3fdf2 100644 --- a/luci-app-openclaw/Makefile +++ b/luci-app-openclaw/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclaw PKG_VERSION:=$(strip $(shell cat $(CURDIR)/VERSION 2>/dev/null || echo "1.0.0")) -PKG_RELEASE:=16 +PKG_RELEASE:=17 PKG_MAINTAINER:=10000ge10000 <10000ge10000@users.noreply.github.com> PKG_LICENSE:=GPL-3.0 diff --git a/luci-app-openclaw/README.md b/luci-app-openclaw/README.md index b8afdb3e8..51125fd60 100644 --- a/luci-app-openclaw/README.md +++ b/luci-app-openclaw/README.md @@ -28,7 +28,7 @@ | 组件 | 默认版本 | 说明 | |------|----------|------| | OpenClaw | `2026.6.1` | npm `latest` 稳定标签；不默认追 `2026.6.5-beta.2` | -| Node.js | `24.15.0` | OpenClaw 2026.6.x 要求 `>=22.19.0`；安装后会按 `engines.node` 做强校验，低于要求会直接失败 | +| Node.js | `22.22.2` | Alpine musl LTS 包；OpenClaw 2026.6.x 要求 `>=22.19.0`，安装后会按 `engines.node` 做强校验 | | 微信插件 | `@tencent-weixin/openclaw-weixin@2.4.3` | CLI 使用 `@tencent-weixin/openclaw-weixin-cli@2.1.4` | ## 📦 安装 diff --git a/luci-app-openclaw/root/usr/bin/openclaw-env b/luci-app-openclaw/root/usr/bin/openclaw-env index 3361636db..2e360e10f 100755 --- a/luci-app-openclaw/root/usr/bin/openclaw-env +++ b/luci-app-openclaw/root/usr/bin/openclaw-env @@ -12,9 +12,9 @@ set -e # ── Node.js 版本策略 (双版本兼容) ── -# V2: 当前推荐版本，用于 OpenClaw v2026.6.1+ (要求 >= 22.19.0，使用 24.15.0 确保兼容) +# V2: 当前推荐版本，用于 OpenClaw v2026.6.1+ (要求 >= 22.19.0，使用 Alpine musl LTS 包确保可运行) # V1: 旧版兼容，用于 OpenClaw v2026.3.8 及更早版本 -NODE_VERSION_V2="24.15.0" +NODE_VERSION_V2="22.22.2" NODE_VERSION_V1="22.15.1" # 默认使用 V2 版本 (可通过 NODE_VERSION 环境变量覆盖) NODE_VERSION="${NODE_VERSION:-${NODE_VERSION_V2}}" diff --git a/luci-app-openclaw/tests/test_node_packaging_contract.sh b/luci-app-openclaw/tests/test_node_packaging_contract.sh index faf601974..bbd289bea 100755 --- a/luci-app-openclaw/tests/test_node_packaging_contract.sh +++ b/luci-app-openclaw/tests/test_node_packaging_contract.sh @@ -20,8 +20,9 @@ fi grep -Fq 'verify_prefix /opt/openclaw/node' "$BUILD_SCRIPT" || fail "build script should verify default install path" grep -Fq 'verify_prefix /tmp/custom-openclaw-root/openclaw/node' "$BUILD_SCRIPT" || fail "build script should verify custom install path" -grep -Fq 'NODE_VER="24.15.0"' "$WORKFLOW" || fail "workflow should build current Node.js" -grep -Fq 'BUILD_MODE=cross' "$WORKFLOW" || fail "workflow should use cross mode for current ARM64 musl package" +grep -Fq 'NODE_VER="22.22.2"' "$WORKFLOW" || fail "workflow should build current musl-compatible Node.js" +grep -Fq 'BUILD_MODE=apk' "$WORKFLOW" || fail "workflow should use apk mode for ARM64 musl package" +grep -Fq 'PKG_TYPE=lts' "$WORKFLOW" || fail "workflow should use Alpine LTS Node.js package" grep -Fq 'oc_node_version_ge "$current_ver" "$node_ver"' "$ENV_SCRIPT" || fail "installer should require installed Node.js to satisfy target version" if grep -Fq 'v1_tarball' "$ENV_SCRIPT"; then diff --git a/luci-app-openclaw/tests/test_openclaw_contracts.sh b/luci-app-openclaw/tests/test_openclaw_contracts.sh index ebeb1867c..786e14514 100755 --- a/luci-app-openclaw/tests/test_openclaw_contracts.sh +++ b/luci-app-openclaw/tests/test_openclaw_contracts.sh @@ -7,7 +7,7 @@ fail() { } grep -q "OC_TESTED_VERSION=\"2026.6.1\"" root/usr/bin/openclaw-env || fail "tested OpenClaw version not pinned" -grep -q "NODE_VERSION_V2=\"24.15.0\"" root/usr/bin/openclaw-env || fail "default Node.js version not pinned" +grep -q "NODE_VERSION_V2=\"22.22.2\"" root/usr/bin/openclaw-env || fail "default Node.js version not pinned" grep -q "OC_NODE_MIN_VERSION=\"\${OC_NODE_MIN_VERSION:-22.19.0}\"" root/usr/bin/openclaw-env || fail "minimum Node.js version not pinned" grep -q "oc_assert_node_min_version" root/usr/bin/openclaw-env || fail "Node.js minimum version check missing" grep -q 'oc_node_version_ge "$from_pkg" "$required"' root/usr/bin/openclaw-env || fail "package Node.js requirement must not lower static minimum" diff --git a/luci-app-openclaw/tests/test_openclaw_node.sh b/luci-app-openclaw/tests/test_openclaw_node.sh index 9414f456a..d65bce542 100755 --- a/luci-app-openclaw/tests/test_openclaw_node.sh +++ b/luci-app-openclaw/tests/test_openclaw_node.sh @@ -8,10 +8,10 @@ fail() { exit 1 } -[ "$(oc_normalize_node_version v24.15.0)" = "24.15.0" ] || fail "normalize v" +[ "$(oc_normalize_node_version v22.22.2)" = "22.22.2" ] || fail "normalize v" oc_node_version_ge 22.19.0 22.19.0 || fail "exact version" oc_node_version_ge 22.19.1 22.19.0 || fail "patch version" -oc_node_version_ge 24.15.0 22.19.0 || fail "major version" +oc_node_version_ge 22.22.2 22.19.0 || fail "supported LTS version" if oc_node_version_ge 22.18.1 22.19.0; then fail "older minor accepted" fi