Merge remote-tracking branch 'origin/main' into refactor/rename-batch2-packaging

This commit is contained in:
JianFeeeee
2026-10-21 16:01:07 +08:00
370 changed files with 864 additions and 864 deletions

View File

@ -66,7 +66,7 @@ GO="${GO:-$(command -v go 2>/dev/null || echo "go")}"
# 实测(2026-10-17):用旧路径构建 waiter,`--version` 输出
# `waiter 1.4.0 (commit unknown, built unknown)`
# 而正确路径得到注入的值。
LDFLAGS="-X github.com/JianFeeeee/HomeAgent/internal/meta.Version=${VERSION} -X github.com/JianFeeeee/HomeAgent/internal/meta.Commit=${COMMIT} -X github.com/JianFeeeee/HomeAgent/internal/meta.BuildTime=${BUILD_TIME}"
LDFLAGS="-X github.com/JianFeeeee/HologramAgent/internal/meta.Version=${VERSION} -X github.com/JianFeeeee/HologramAgent/internal/meta.Commit=${COMMIT} -X github.com/JianFeeeee/HologramAgent/internal/meta.BuildTime=${BUILD_TIME}"
# 版本与提交的**权威来源**是上面注入的 meta.Version / meta.Commit,不是 Go 自带的
# VCS 戳。后者不进 build cache key(Go 文档明确说明 VCS 变化不会触发重建),
@ -227,7 +227,7 @@ build_homed() {
case "$_embedkey" in
????????????????????????????????????????????????????????????????)
# 64 字符:形状像 32 字节 hex
_keyflag=" -X github.com/JianFeeeee/HomeAgent/internal/security.embeddedKeyHex=$_embedkey"
_keyflag=" -X github.com/JianFeeeee/HologramAgent/internal/security.embeddedKeyHex=$_embedkey"
echo " [security] 内嵌主密钥已注入(64 位 hex)" ;;
*)
echo " error: HA_EMBEDDED_KEY_HEX 必须是 64 位 hex(当前 ${#_embedkey} 字符)" >&2
@ -237,7 +237,7 @@ build_homed() {
CGO_ENABLED=1 CC="$_cc" "$GO" build -buildvcs=false -trimpath -installsuffix dynlink \
${_tagargs[@]+"${_tagargs[@]}"} \
-ldflags "$LDFLAGS -X github.com/JianFeeeee/HomeAgent/internal/kernelboot.EmbeddedGraphHash=$_graph_hash$_keyflag" -o "$out" ./cmd/homed/
-ldflags "$LDFLAGS -X github.com/JianFeeeee/HologramAgent/internal/kernelboot.EmbeddedGraphHash=$_graph_hash$_keyflag" -o "$out" ./cmd/homed/
echo " OK ($(file "$out" | sed 's/.*: //') | $(du -h "$out" | cut -f1))"
}

View File

@ -99,11 +99,11 @@ func TestPackagingLdflagsUseCurrentModulePath(t *testing.T) {
if strings.Contains(src, "gitcode.com/JianFeeeee/HomeAgent") {
t.Fatal("★ build.sh 的 LDFLAGS 用的是**历史**模块路径 " +
"`gitcode.com/JianFeeeee/HomeAgent`;当前模块是 " +
"`github.com/JianFeeeee/HomeAgent`。\n" +
"`github.com/JianFeeeee/HologramAgent`。\n" +
" `-X` 对未知路径**静默无效** ⇒ 发行包的 Version/Commit/BuildTime " +
"全是默认值(实测 --version 输出 unknown)")
}
if !strings.Contains(src, "github.com/JianFeeeee/HomeAgent/internal/meta.Version") {
if !strings.Contains(src, "github.com/JianFeeeee/HologramAgent/internal/meta.Version") {
t.Fatal("★ build.sh 必须用 github.com/... 注入 meta.Version")
}
}