From b12dd1c7f9d8e3fc38f498ca969479c275f13030 Mon Sep 17 00:00:00 2001 From: Morris Date: Wed, 18 Nov 2026 20:34:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.0.10=EF=BC=9A=E6=B2=BF=E7=94=A8=20GC=20?= =?UTF-8?q?=E5=91=BD=E5=90=8D=EF=BC=8CLinux=20=E7=9B=AE=E6=A0=87=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20arm64?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 命名 - 发布包名回到 GC-<版本>-<平台>(zip 与包内启动器同名),1.0.10 直接可用; GCL- 前缀只是预留,解析层同时认,等下个大版本再切 - LauncherArtifacts.PackageFileName / LauncherUpdater / 打包脚本 / 文档同步 Linux - 构建目标由 linux-amd64 改为 linux-arm64(GC.Tests 的 Linux 分支照样覆盖) - Flutter Linux 前端只有 x64 官方引擎产物,aarch64 主机构建时读 build/linux/arm64/release/bundle;x64 主机会明确跳过并说明原因, 不再产出装不上 arm 机器的 x64 包 - 清单平台表 linux-x64 -> linux-arm64,LabelOf 保留 linux-x64 别名读旧产物 版本 - Directory.Build.props 1.0.9 -> 1.0.10,version.json / model/version.json 重签 验证 - ./build.sh build:win-amd64 71MB、win-arm64 69MB,均为单顶层目录 + 包内 safedog/ + Flutter 前端 - GC.Tests --update-test 全部通过 --- Directory.Build.props | 2 +- GC-DOWNLOAD/LauncherArtifacts.cs | 10 ++-- GC-DOWNLOAD/LauncherUpdater.cs | 7 +-- GC-SAVEDOG/Applier.cs | 2 +- GC-UI/CI.md | 4 +- GC/src/test/dotnet/GC.Tests/Program.cs | 6 +-- README.md | 16 +++---- buildsh/build.sh | 24 ++++++++-- buildsh/lib/build_funcs.sh | 59 ++++++++++++++++-------- model/_engine/VersionStamp/Program.cs | 2 +- model/version.json | 64 +++++++++++++------------- version.json | 64 +++++++++++++------------- 12 files changed, 147 insertions(+), 113 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1f86bdd..ff541cf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -22,7 +22,7 @@ --> 11.3.9 8.2.2 - 1.0.9 + 1.0.10 Morris GC zh-Hans diff --git a/GC-DOWNLOAD/LauncherArtifacts.cs b/GC-DOWNLOAD/LauncherArtifacts.cs index 8ddc247..2223743 100644 --- a/GC-DOWNLOAD/LauncherArtifacts.cs +++ b/GC-DOWNLOAD/LauncherArtifacts.cs @@ -29,7 +29,8 @@ public static class LauncherArtifacts "win-arm64" => "win-arm64", "osx-arm64" => "mac-arm64", "osx-x64" => "mac-x64", - "linux-x64" => "linux-amd64", + "linux-x64" => "linux-amd64", // 旧产物目录名,仍能读 + "linux-arm64" => "linux-arm64", _ => rid }; @@ -46,9 +47,9 @@ public static class LauncherArtifacts return new[] { label, rid }; } - /// 启动器包应有的文件名,如 GCL-1.0.9-mac-arm64.zip。 + /// 启动器包应有的文件名,如 GC-1.0.10-mac-arm64.zip。 public static string PackageFileName(string version, string rid) - => $"GCL-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip"; + => $"GC-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip"; /// /// 判断某个 zip 名是不是「这个版本 + 这个平台」的启动器包。 @@ -57,7 +58,8 @@ public static class LauncherArtifacts public static bool LooksLikePackage(string fileName, string version, string rid) { if (!fileName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)) return false; - // 新包叫 GCL-<版本>-<平台>.zip;旧包(GC-)仍认,方便从旧版本升级。 + // 当前发布包叫 GC-<版本>-<平台>.zip;GCL- 前缀是为下个大版本预留的命名, + // 这里一并认,免得到时候还要再改一次解析。 if (!fileName.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase) && !fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false; diff --git a/GC-DOWNLOAD/LauncherUpdater.cs b/GC-DOWNLOAD/LauncherUpdater.cs index bfb0845..b06cb86 100644 --- a/GC-DOWNLOAD/LauncherUpdater.cs +++ b/GC-DOWNLOAD/LauncherUpdater.cs @@ -367,9 +367,9 @@ public static class LauncherUpdater else if (File.Exists(manifestCopy)) File.Delete(manifestCopy); - // 包名:GCL-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。 + // 包名:GC-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。 // Linux 的启动器没有扩展名,别硬加 .exe —— 那会让按包名查找永远落空。 - var packageName = $"GCL-{latest}-{PlatformLabel}" + + var packageName = $"GC-{latest}-{PlatformLabel}" + (OperatingSystem.IsMacOS() ? ".app" : OperatingSystem.IsWindows() ? ".exe" : ""); @@ -729,7 +729,8 @@ public static class LauncherUpdater // Linux 的启动器没有扩展名(GC-1.0.9-linux-amd64),以前只认 .app/.exe, // 结果解压完判定「没找到新版启动器」,Linux 更新永远失败。 // 注意不能用 Path.HasExtension:版本号 9.9.9 里的点会让它误判成有扩展名。 - if (name.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase) && + if ((name.StartsWith("GC-", StringComparison.OrdinalIgnoreCase) || + name.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase)) && name.EndsWith("-" + PlatformLabel, StringComparison.OrdinalIgnoreCase)) { TryMarkExecutable(dest); diff --git a/GC-SAVEDOG/Applier.cs b/GC-SAVEDOG/Applier.cs index 2d9c875..08c279a 100644 --- a/GC-SAVEDOG/Applier.cs +++ b/GC-SAVEDOG/Applier.cs @@ -355,7 +355,7 @@ internal sealed class Applier { if (!fileName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return 0; - // 发布包把启动器改名成 GCL-<版本>-<系统>-<架构>.exe(旧包是 GC-),先按这个模式认出来。 + // 发布包把启动器改名成 GC-<版本>-<系统>-<架构>.exe(GCL- 是预留前缀),先按这个模式认出来。 if (VersionedExePattern.IsMatch(fileName)) return 110; var name = Path.GetFileNameWithoutExtension(fileName); diff --git a/GC-UI/CI.md b/GC-UI/CI.md index a742b9c..e76e1f4 100644 --- a/GC-UI/CI.md +++ b/GC-UI/CI.md @@ -69,7 +69,7 @@ Windows 还需要 **VS Build Tools 的「使用 C++ 的桌面开发」工作负 ```bash # 按构建主机自动选目标,每条产物都带 Flutter 前端: # macOS 主机 → mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉) -# Linux 主机 → linux-amd64(原生)+ win-amd64 / win-arm64(mingw 交叉) +# Linux 主机 → linux-arm64(仅 aarch64 主机)+ win-amd64 / win-arm64(mingw 交叉) # Windows 主机 → win-amd64 / win-arm64(原生) ./build.sh build @@ -96,7 +96,7 @@ sudo apt install clang cmake ninja-build pkg-config libgtk-3-dev libstdc++-14-de `-lstdc++`,系统只装了 gcc-13 的开发包时链接会失败,报 `cannot find -lstdc++`。 产物布局:`GC-UI` + `lib/libflutter_linux_gtk.so` + `data/`,与官方 `flutter build -linux` 的 bundle 一致,直接铺进 `dist/linux-amd64/`。 +linux` 的 bundle 一致,直接铺进 `dist/linux-arm64/`。 ### Windows 前端交叉编译 diff --git a/GC/src/test/dotnet/GC.Tests/Program.cs b/GC/src/test/dotnet/GC.Tests/Program.cs index 03bc033..7232b6b 100644 --- a/GC/src/test/dotnet/GC.Tests/Program.cs +++ b/GC/src/test/dotnet/GC.Tests/Program.cs @@ -195,7 +195,7 @@ internal static class Program Directory.CreateDirectory(stage); // Linux 的启动器没有扩展名,测试包名要跟着平台走 var launcherExt = OperatingSystem.IsWindows() ? ".exe" : ""; - File.WriteAllText(Path.Combine(stage, "GCL-9.9.9-" + LauncherUpdater.PlatformLabel + launcherExt), + File.WriteAllText(Path.Combine(stage, "GC-9.9.9-" + LauncherUpdater.PlatformLabel + launcherExt), "new launcher"); var zip = Path.Combine(tmp, "GC-" + rid + ".zip"); ZipFile.CreateFromDirectory(stage, zip); @@ -238,14 +238,14 @@ internal static class Program { var script = File.ReadAllText(scriptPath); Check(!script.Contains(tmp), "脚本不含绝对路径"); - Check(script.Contains("GCL-*") || script.Contains("GC-*"), "脚本按 GCL-*/GC-* 匹配删除"); + Check(script.Contains("GC-*") || script.Contains("GCL-*"), "脚本按 GC-*/GCL-* 匹配删除"); } // 5b) 只发产物、不发 Release:更新包只存在于仓库 dist/<系统>-<架构>/ 目录里。 // 清单不写 url、不写 path,只给 dir + name + sha256,客户端要能自己找过去。 var distDir = Path.Combine(remote, "dist", LauncherUpdater.PlatformLabel); Directory.CreateDirectory(distDir); - var distName = "GCL-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip"; + var distName = "GC-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip"; var distZip = Path.Combine(distDir, distName); File.Copy(zip, distZip, true); diff --git a/README.md b/README.md index 38ca0ca..222a0f7 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run ``` <解压出来的目录>/ ← 压缩包里只有这一个文件夹 - GCL-<版本>-<平台>(.exe | .app/) 启动器 + GC-<版本>-<平台>(.exe | .app/) 启动器 GC-UI(.exe) Flutter 前端 safedog/GC-SAVEDOG[.exe] 更新守护进程(运行时复制到 .GC/safedog) data/ lib/ *.dll 后端与 Flutter 运行时 @@ -225,8 +225,8 @@ Repository/ | 方式 | 清单字段 | 说明 | | --- | --- | --- | -| Release 附件(推荐) | `url` | `.../releases/download/<版本>/GCL-<版本>-<系统>-<架构>.zip` | -| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GCL-<版本>-<系统>-<架构>.zip` | +| Release 附件(推荐) | `url` | `.../releases/download/<版本>/GC-<版本>-<系统>-<架构>.zip` | +| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GC-<版本>-<系统>-<架构>.zip` | 下载端按 `url` → `path` → `dist/<系统>-<架构>/` 目录扫描的顺序尝试, **每个候选都必须与清单里的 `sha256` 一致**(`sha256` 由签名保护), @@ -252,15 +252,15 @@ Repository/ | 产物 | 平台 | | --- | --- | -| `dist/mac-arm64/GCL-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GCL-….app`) | -| `dist/win-amd64/GCL-<版本>-win-amd64.zip` | Windows x64(单顶层 `GCL-…/`,含 Flutter 前端与 `safedog/`) | -| `dist/win-arm64/GCL-<版本>-win-arm64.zip` | Windows on ARM 同上 | -| `dist/linux-amd64/GCL-<版本>-linux-amd64.zip` | Linux x64 同上(启动器无扩展名) | +| `dist/mac-arm64/GC-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GC-….app`) | +| `dist/win-amd64/GC-<版本>-win-amd64.zip` | Windows x64(单顶层 `GC-…/`,含 Flutter 前端与 `safedog/`) | +| `dist/win-arm64/GC-<版本>-win-arm64.zip` | Windows on ARM 同上 | +| `dist/linux-arm64/GC-<版本>-linux-arm64.zip` | Linux ARM64 同上(启动器无扩展名,需在 aarch64 主机构建) | 平台目录就是「该平台的编译产物目录」:打包完成后只留最终 zip(原始 `.app` / `.exe` 会被挪到 `build/trash/`,下次构建时移出,不做递归删除)。 -发新版:`./build.sh build -version=1.0.10` → 把 `dist/<平台>/GCL-1.0.10-<平台>.zip` +发新版:`./build.sh build` → 把 `dist/<平台>/GC-<版本>-<平台>.zip` 上传到 Gitea Release(tag `v1.0.8`),**或者**直接提交/上传到仓库的 `dist/<平台>/` 目录 → 提交并推送 `version.json` / `model/version.json`。 两种都能被客户端识别,客户端下次启动就会看到更新。 diff --git a/buildsh/build.sh b/buildsh/build.sh index a4e55d4..6204db0 100644 --- a/buildsh/build.sh +++ b/buildsh/build.sh @@ -3,7 +3,7 @@ # # 目标平台按构建主机决定,每条产物都带 Flutter 前端: # macOS 主机 : mac-arm64(原生)+ win-amd64 / win-arm64(mingw 交叉) -# Linux 主机 : linux-amd64(原生)+ win-amd64 / win-arm64(mingw 交叉) +# Linux 主机 : linux-arm64(原生 / 交叉)+ win-amd64 / win-arm64(mingw 交叉) # Windows 主机: win-amd64 / win-arm64(原生) # # 前端是默认必需项:flutter 缺失或编译失败一律中断,不再悄悄产出只带 Avalonia @@ -23,6 +23,20 @@ bs_build() { MINGW*|MSYS*|CYGWIN*) : ;; # Windows 主机只能编 Windows *) BUILD_LINUX=1 ;; esac + # Linux 目标已切成 arm64:Flutter 的 Linux 前端必须用 aarch64 主机自带的 + # engine 产物(官方只发 x64 版),x64 主机上强行编出来的是 x64 二进制, + # 装到 arm 机器上跑不起来。这里直接跳过,并说明原因,不当成构建失败。 + if [ "$BUILD_LINUX" = 1 ]; then + case "$(uname -m)" in + aarch64|arm64) ;; + *) + BUILD_LINUX=0 + echo "!! 跳过 Linux 产物:目标为 linux-arm64,当前主机是 $(uname -m)" + echo " (Flutter Linux 引擎只有 x64 官方产物,需在 aarch64 主机上构建)" + ;; + esac + fi + # 显式降级:允许在没有该平台 Flutter 宿主的情况下仍出 Avalonia 版包 ALLOW_NO_UI="${GC_ALLOW_NO_UI:-0}" @@ -91,9 +105,9 @@ bs_build() { if [ "$BUILD_LINUX" = 1 ]; then progress_step "编译 Linux" - _run_publish linux 70 publish_rid "linux-x64" "dist/linux-amd64" false || return 1 - publish_backend "linux-x64" "dist/linux-amd64" || return 1 - build_flutter_ui linux "dist/linux-amd64" || return 1 + _run_publish linux 70 publish_rid "linux-arm64" "dist/linux-arm64" false || return 1 + publish_backend "linux-arm64" "dist/linux-arm64" || return 1 + build_flutter_ui linux "dist/linux-arm64" || return 1 fi # Windows 前端:Windows 主机走官方 toolchain;Linux/macOS 主机用 mingw-w64 + @@ -116,7 +130,7 @@ bs_build() { prepare_runtime_layout "dist/win-amd64" prepare_runtime_layout "dist/win-arm64" if [ "$BUILD_LINUX" = 1 ]; then - prepare_runtime_layout "dist/linux-amd64" + prepare_runtime_layout "dist/linux-arm64" fi if [ -d "$ROOT_DIR/dist/mac-arm64/GC.app/Contents/MacOS" ]; then prepare_runtime_layout "dist/mac-arm64/GC.app/Contents/MacOS" diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index e15d65e..d9265b6 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -164,9 +164,10 @@ pack_models() { # 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置) # # 产物落点遵循「仓库 dist/<系统>-<架构>/」布局: -# dist/mac-arm64/GCL-<版本>-mac-arm64.zip -# dist/win-amd64/GCL-<版本>-win-amd64.zip -# dist/win-arm64/GCL-<版本>-win-arm64.zip +# dist/mac-arm64/GC-<版本>-mac-arm64.zip +# dist/win-amd64/GC-<版本>-win-amd64.zip +# dist/win-arm64/GC-<版本>-win-arm64.zip +# dist/linux-arm64/GC-<版本>-linux-arm64.zip # 启动器更新时既可以从 Release 附件下载,也会到这些目录里找编译产物 # (见 GC-DOWNLOAD/LauncherArtifacts.cs),所以两种发布方式都能用。 # @@ -224,8 +225,28 @@ build_flutter_ui() { cp -R "$UI_SRC/build/macos/Build/Products/Release/GC-UI.app" "$ROOT_DIR/$DEST/" ;; linux) - # bundle/ 里是 GC-UI、lib/*.so 与 data/,整体铺到包的根目录 - cp -R "$UI_SRC/build/linux/x64/release/bundle/." "$ROOT_DIR/$DEST/" + # bundle/ 里是 GC-UI、lib/*.so 与 data/,整体铺到包的根目录。 + # 目录名跟着目标架构走:aarch64 主机在 build/linux/arm64/,x64 在 build/linux/x64/。 + BUNDLE="" + for cand in "$UI_SRC/build/linux/arm64/release/bundle" \ + "$UI_SRC/build/linux/x64/release/bundle"; do + [ -d "$cand" ] && BUNDLE="$cand" && break + done + if [ -z "$BUNDLE" ]; then + echo "!! 找不到 Flutter Linux bundle(期望 build/linux/{arm64,x64}/release/bundle)" + return 1 + fi + # 目标包是 arm64,却只编出 x64 bundle:说明主机架构不对,宁可失败也不出坏包 + case "$BUNDLE" in + */arm64/*) ;; + *) + if [ "$(uname -m)" != "aarch64" ] && [ "$(uname -m)" != "arm64" ]; then + echo "!! Linux 包目标为 arm64,但当前主机 $(uname -m) 只能编出 x64 前端" + return 1 + fi + ;; + esac + cp -R "$BUNDLE/." "$ROOT_DIR/$DEST/" ;; *) echo "!! 不支持的 Flutter 目标平台:$PLAT" @@ -279,9 +300,9 @@ pack_launcher() { [ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1) [ -n "$EXE" ] || continue - # 包内只有一个顶层目录(GCL-<版本>-<平台>),解压后不会散落一屏 dll。 + # 包内只有一个顶层目录(GC-<版本>-<平台>),解压后不会散落一屏 dll。 TMP="$ROOT_DIR/dist/.winpkg-$LABEL" - PKGNAME="GCL-${VERSION}-${LABEL}" + PKGNAME="GC-${VERSION}-${LABEL}" PKG="$TMP/$PKGNAME" rm -rf "$TMP"; mkdir -p "$PKG" cp -R "$SRC"/. "$PKG"/ @@ -307,10 +328,10 @@ pack_launcher() { done # --- Linux:整目录打包(启动器 + 守护 + 后端 + Flutter 前端)--- - SRC="$ROOT_DIR/dist/linux-amd64" + SRC="$ROOT_DIR/dist/linux-arm64" if [ -d "$SRC" ]; then TMP="$ROOT_DIR/dist/.linuxpkg" - PKGNAME="GCL-${VERSION}-linux-amd64" + PKGNAME="GC-${VERSION}-linux-arm64" PKG="$TMP/$PKGNAME" rm -rf "$TMP"; mkdir -p "$PKG" cp -R "$SRC"/. "$PKG"/ @@ -326,17 +347,17 @@ pack_launcher() { if [ ! -f "$PKG/GC-UI" ]; then echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面" fi - ZIP="$ROOT_DIR/dist/linux-amd64/$PKGNAME.zip" + ZIP="$ROOT_DIR/dist/linux-arm64/$PKGNAME.zip" rm -f "$ZIP" ( cd "$TMP" && zip -qry "$ZIP" "$PKGNAME" ) rm -rf "$TMP" - echo " -> dist/linux-amd64/$PKGNAME.zip" + echo " -> dist/linux-arm64/$PKGNAME.zip" fi # --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)--- MACAPP="$ROOT_DIR/dist/mac-arm64/GC.app" if [ -d "$MACAPP" ]; then - FINAL="$ROOT_DIR/dist/GCL-${VERSION}-mac-arm64.app" + FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app" rm -rf "$FINAL" mv "$MACAPP" "$FINAL" chmod +x "$FINAL/Contents/MacOS/GC" 2>/dev/null || true @@ -350,14 +371,14 @@ pack_launcher() { fi # --- 统一压缩:每个产物都打成同名 .zip,放进自己的平台目录 --- - # GCL-1.0.3-mac-arm64.app -> dist/mac-arm64/GCL-1.0.3-mac-arm64.zip + # GC-1.0.3-mac-arm64.app -> dist/mac-arm64/GC-1.0.3-mac-arm64.zip # 客户端下载时按「原名去掉扩展名 + .zip」取包,再解压回原名。 echo "==> 压缩为 zip" - for art in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do + for art in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do [ -e "$art" ] || continue base=$(basename "$art") name="${base%.*}" # 去掉 .exe / .app - label="${name#GCL-${VERSION}-}" # mac-arm64 / win-amd64 + label="${name#GC-${VERSION}-}" # mac-arm64 / win-amd64 ZIP="$ROOT_DIR/dist/${label}/${name}.zip" mkdir -p "$ROOT_DIR/dist/${label}" rm -f "$ZIP" @@ -379,7 +400,7 @@ pack_launcher() { # 一次性删除又慢又不可逆,先挪走更安全(暂存区在下次构建开始时挪出 dist)。 TRASH="$ROOT_DIR/build/trash" mkdir -p "$TRASH" - for leftover in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do + for leftover in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do [ -e "$leftover" ] || continue mv "$leftover" "$TRASH/$(basename "$leftover")-$(date +%s)" 2>/dev/null || true done @@ -388,15 +409,15 @@ pack_launcher() { stamp_launcher_only echo "" echo "==> dist 里可发布的 zip:" - ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true + ls -lh "$ROOT_DIR"/dist/*/GC-"$VERSION"-*.zip 2>/dev/null || true } # 删除 publish 过程中的中间目录:平台目录里只留最终 zip strip_intermediate_dirs() { - for d in win-amd64 win-x64 win-arm64 mac-arm64 linux-amd64 linux-x64; do + for d in win-amd64 win-x64 win-arm64 mac-arm64 linux-arm64 linux-x64; do [ -d "$ROOT_DIR/dist/$d" ] || continue find "$ROOT_DIR/dist/$d" -mindepth 1 -maxdepth 1 \ - ! -name "GCL-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true + ! -name "GC-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true done find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true } diff --git a/model/_engine/VersionStamp/Program.cs b/model/_engine/VersionStamp/Program.cs index 91e05ff..bf8781d 100644 --- a/model/_engine/VersionStamp/Program.cs +++ b/model/_engine/VersionStamp/Program.cs @@ -151,7 +151,7 @@ var packages = new Dictionary>(); // 不发 Release、只提交产物也能更新(用户明确要求支持这种布局)。 // 两种都写:url 只是「去哪儿找」,真正的完整性凭据是下面的 sha256(受签名保护)。 var releaseBase = $"{Repository}/releases/download/{launcherVersion}"; -foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-x64" }) +foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-arm64" }) { var label = LauncherArtifacts.LabelOf(rid); var fileName = LauncherArtifacts.PackageFileName(launcherVersion, rid); diff --git a/model/version.json b/model/version.json index 6143f2b..0903271 100644 --- a/model/version.json +++ b/model/version.json @@ -1,48 +1,46 @@ { "schema": 1, - "generated": "2026-11-18T10:16:41Z", + "generated": "2026-11-18T12:33:25Z", "repository": "https://git.xhmcl.com/Morris/GC", "branch": "main", "modelDir": "model", "launcher": { - "version": "1.0.9", + "version": "1.0.10", "revision": "", "packages": { "win-x64": { - "path": "dist/win-amd64/GC-1.0.9-win-amd64.zip", + "path": "dist/win-amd64/GC-1.0.10-win-amd64.zip", "dir": "dist/win-amd64", - "name": "GC-1.0.9-win-amd64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-amd64.zip", - "sha256": "0807f1005e2d8bd54316529670cf1c3c89a2df07bd39297145f21c9a0aae5f04", - "size": 114372206 + "name": "GC-1.0.10-win-amd64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-amd64.zip", + "sha256": "a2e581b82ccb61cc05f84f69c7ea7e3cd2e1eab0ed5118047e287453aab54d52", + "size": 74322650 }, "win-arm64": { - "path": "dist/win-arm64/GC-1.0.9-win-arm64.zip", + "path": "dist/win-arm64/GC-1.0.10-win-arm64.zip", "dir": "dist/win-arm64", - "name": "GC-1.0.9-win-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-arm64.zip", - "sha256": "ffdc37f8ea5041d69be88ffbcbf9ba5d80f7fb97c6b3debc5a918ff89f9e7f60", - "size": 110425463 + "name": "GC-1.0.10-win-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-arm64.zip", + "sha256": "e0a41e49fd7d493ff92b7b5093b9ce5685988fe572cd1eff6cf95bb9a46eeb70", + "size": 72067436 }, "osx-arm64": { - "path": "dist/mac-arm64/GC-1.0.9-mac-arm64.zip", + "path": "dist/mac-arm64/GC-1.0.10-mac-arm64.zip", "dir": "dist/mac-arm64", - "name": "GC-1.0.9-mac-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-arm64.zip", - "sha256": "e62bbc8c9925d8158f850440600b5d16af7539c85651a5ebcc5f9a85d4c9bb01", - "size": 60066040 + "name": "GC-1.0.10-mac-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-arm64.zip" }, "osx-x64": { - "path": "dist/mac-x64/GC-1.0.9-mac-x64.zip", + "path": "dist/mac-x64/GC-1.0.10-mac-x64.zip", "dir": "dist/mac-x64", - "name": "GC-1.0.9-mac-x64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-x64.zip" + "name": "GC-1.0.10-mac-x64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-x64.zip" }, - "linux-x64": { - "path": "dist/linux-amd64/GC-1.0.9-linux-amd64.zip", - "dir": "dist/linux-amd64", - "name": "GC-1.0.9-linux-amd64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-linux-amd64.zip" + "linux-arm64": { + "path": "dist/linux-arm64/GC-1.0.10-linux-arm64.zip", + "dir": "dist/linux-arm64", + "name": "GC-1.0.10-linux-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-linux-arm64.zip" } } }, @@ -51,7 +49,7 @@ "id": "contour-map", "version": "1.1", "build": "773ab2161d", - "manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733", + "manifestSha256": "576c4088127982afaefeef6b3cd9ee2c0b062a94967ba854a090986d8136b0b6", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" @@ -60,7 +58,7 @@ "id": "earth-geography", "version": "1.9", "build": "cc68b8863b", - "manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a", + "manifestSha256": "fcd38ab5e23bd6faefcdf2d199b0643c1d3c014c789eb862688d588b4434fdb8", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" @@ -69,7 +67,7 @@ "id": "earth-revolution", "version": "1.7", "build": "53b7a0fbc3", - "manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167", + "manifestSha256": "fc71fa7f6b524512ab7ad039e0ee759f45b8ac08ccdbca7e93297424fd36b64b", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" @@ -78,7 +76,7 @@ "id": "earth-rotation", "version": "1.7", "build": "ecd52665f9", - "manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca", + "manifestSha256": "2aabc7a6e35c42b671e5be62b09414628eff08c5646de8d50dd16a25bb804b1c", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" @@ -87,7 +85,7 @@ "id": "scale-calculator", "version": "1.6", "build": "105653737d", - "manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3", + "manifestSha256": "971b4438ebbbf4f8042d8ce035f696e713aae532c3b94231a2d9c60c102cef98", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator" @@ -96,8 +94,8 @@ "signature": { "alg": "ECDSA-P256-SHA256", "keyId": "gc-2026-12", - "value": "A2jaSxRK1B43k8uOWmC/8diYG6JYUncGgjXW8B1ntO5Ag5rsG7Pb2gMz5ad6AcwjZ9zs8qtsSxJv8vLsUNXtWw==", - "contentSha256": "3bf738a164537e5d575e75c314f0ac01af1cb5d4d7cb882489d8dedeb73f51e9", - "signedAt": "2026-11-18T10:18:01Z" + "value": "6mZUj+t6AExyLQbauvQSLCicUFUbesPGs0jTd6FGwjm+mxEud7e+0fvmmdo+HDFZY6NifIrVENIB6Q5TlLVS7g==", + "contentSha256": "76cabe2d25001bf0a07aadc831bb6222bc00ed0114cde1e83ac8e29db6069a55", + "signedAt": "2026-11-18T12:33:26Z" } } diff --git a/version.json b/version.json index 6143f2b..0903271 100644 --- a/version.json +++ b/version.json @@ -1,48 +1,46 @@ { "schema": 1, - "generated": "2026-11-18T10:16:41Z", + "generated": "2026-11-18T12:33:25Z", "repository": "https://git.xhmcl.com/Morris/GC", "branch": "main", "modelDir": "model", "launcher": { - "version": "1.0.9", + "version": "1.0.10", "revision": "", "packages": { "win-x64": { - "path": "dist/win-amd64/GC-1.0.9-win-amd64.zip", + "path": "dist/win-amd64/GC-1.0.10-win-amd64.zip", "dir": "dist/win-amd64", - "name": "GC-1.0.9-win-amd64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-amd64.zip", - "sha256": "0807f1005e2d8bd54316529670cf1c3c89a2df07bd39297145f21c9a0aae5f04", - "size": 114372206 + "name": "GC-1.0.10-win-amd64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-amd64.zip", + "sha256": "a2e581b82ccb61cc05f84f69c7ea7e3cd2e1eab0ed5118047e287453aab54d52", + "size": 74322650 }, "win-arm64": { - "path": "dist/win-arm64/GC-1.0.9-win-arm64.zip", + "path": "dist/win-arm64/GC-1.0.10-win-arm64.zip", "dir": "dist/win-arm64", - "name": "GC-1.0.9-win-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-win-arm64.zip", - "sha256": "ffdc37f8ea5041d69be88ffbcbf9ba5d80f7fb97c6b3debc5a918ff89f9e7f60", - "size": 110425463 + "name": "GC-1.0.10-win-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-arm64.zip", + "sha256": "e0a41e49fd7d493ff92b7b5093b9ce5685988fe572cd1eff6cf95bb9a46eeb70", + "size": 72067436 }, "osx-arm64": { - "path": "dist/mac-arm64/GC-1.0.9-mac-arm64.zip", + "path": "dist/mac-arm64/GC-1.0.10-mac-arm64.zip", "dir": "dist/mac-arm64", - "name": "GC-1.0.9-mac-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-arm64.zip", - "sha256": "e62bbc8c9925d8158f850440600b5d16af7539c85651a5ebcc5f9a85d4c9bb01", - "size": 60066040 + "name": "GC-1.0.10-mac-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-arm64.zip" }, "osx-x64": { - "path": "dist/mac-x64/GC-1.0.9-mac-x64.zip", + "path": "dist/mac-x64/GC-1.0.10-mac-x64.zip", "dir": "dist/mac-x64", - "name": "GC-1.0.9-mac-x64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-mac-x64.zip" + "name": "GC-1.0.10-mac-x64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-x64.zip" }, - "linux-x64": { - "path": "dist/linux-amd64/GC-1.0.9-linux-amd64.zip", - "dir": "dist/linux-amd64", - "name": "GC-1.0.9-linux-amd64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.9/GC-1.0.9-linux-amd64.zip" + "linux-arm64": { + "path": "dist/linux-arm64/GC-1.0.10-linux-arm64.zip", + "dir": "dist/linux-arm64", + "name": "GC-1.0.10-linux-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-linux-arm64.zip" } } }, @@ -51,7 +49,7 @@ "id": "contour-map", "version": "1.1", "build": "773ab2161d", - "manifestSha256": "f86a3f83d5953cafc333585da3009d8846448f6a8a9df13b39cde57b36037733", + "manifestSha256": "576c4088127982afaefeef6b3cd9ee2c0b062a94967ba854a090986d8136b0b6", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" @@ -60,7 +58,7 @@ "id": "earth-geography", "version": "1.9", "build": "cc68b8863b", - "manifestSha256": "448f050fded46d7bfc8f0c3856e741c4a4f82523c8e012dd846ddcd400ff394a", + "manifestSha256": "fcd38ab5e23bd6faefcdf2d199b0643c1d3c014c789eb862688d588b4434fdb8", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" @@ -69,7 +67,7 @@ "id": "earth-revolution", "version": "1.7", "build": "53b7a0fbc3", - "manifestSha256": "c69fc53f50213c6ab7658e1a761a20d2c55a7a344beb3c75a30393c26fa40167", + "manifestSha256": "fc71fa7f6b524512ab7ad039e0ee759f45b8ac08ccdbca7e93297424fd36b64b", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" @@ -78,7 +76,7 @@ "id": "earth-rotation", "version": "1.7", "build": "ecd52665f9", - "manifestSha256": "cbf12a47747a331c9980260f39169b1813bb4b52a8916995fda05755267bddca", + "manifestSha256": "2aabc7a6e35c42b671e5be62b09414628eff08c5646de8d50dd16a25bb804b1c", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" @@ -87,7 +85,7 @@ "id": "scale-calculator", "version": "1.6", "build": "105653737d", - "manifestSha256": "fc6f7deb1efb076cc0bbee732e7de8f007ed74bc837dba2268be1e0adc1839d3", + "manifestSha256": "971b4438ebbbf4f8042d8ce035f696e713aae532c3b94231a2d9c60c102cef98", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator" @@ -96,8 +94,8 @@ "signature": { "alg": "ECDSA-P256-SHA256", "keyId": "gc-2026-12", - "value": "A2jaSxRK1B43k8uOWmC/8diYG6JYUncGgjXW8B1ntO5Ag5rsG7Pb2gMz5ad6AcwjZ9zs8qtsSxJv8vLsUNXtWw==", - "contentSha256": "3bf738a164537e5d575e75c314f0ac01af1cb5d4d7cb882489d8dedeb73f51e9", - "signedAt": "2026-11-18T10:18:01Z" + "value": "6mZUj+t6AExyLQbauvQSLCicUFUbesPGs0jTd6FGwjm+mxEud7e+0fvmmdo+HDFZY6NifIrVENIB6Q5TlLVS7g==", + "contentSha256": "76cabe2d25001bf0a07aadc831bb6222bc00ed0114cde1e83ac8e29db6069a55", + "signedAt": "2026-11-18T12:33:26Z" } } -- 2.54.0 From b8717c1c95716504a4e42d21db35da6896efde92 Mon Sep 17 00:00:00 2001 From: Morris Date: Wed, 18 Nov 2026 20:38:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.0.10=20=E7=9B=B4=E6=8E=A5=E5=90=AF?= =?UTF-8?q?=E7=94=A8=20GCL=20=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 既然 1.0.9 升 1.0.10 本来就要手动装一次(旧 SAVEDOG 不认单目录包), 直接把新命名一起切过来,省掉一次迁移窗口。 - 发布包改名 GCL-<版本>-<平台>:zip、包内启动器、清单 path/name/url 全部同步 - 旧 GC- 包仍然识别(IsLauncherPackage / VersionUtil / SAVEDOG 主程序正则), 装过 1.0.9 的机器不会把新包判成「不是启动器包」 - 打包脚本、README、GC.Tests 用例跟随改名 验证:./build.sh build 产出 GCL-1.0.10-win-{amd64,arm64}.zip(单顶层目录, 含 Flutter 前端与 safedog/);GC.Tests --update-test 全部通过。 --- GC-DOWNLOAD/LauncherArtifacts.cs | 8 ++-- GC-DOWNLOAD/LauncherUpdater.cs | 4 +- GC-SAVEDOG/Applier.cs | 2 +- GC/src/test/dotnet/GC.Tests/Program.cs | 4 +- README.md | 16 ++++---- buildsh/build.sh | 2 +- buildsh/lib/build_funcs.sh | 30 +++++++------- model/version.json | 56 +++++++++++++------------- version.json | 56 +++++++++++++------------- 9 files changed, 89 insertions(+), 89 deletions(-) diff --git a/GC-DOWNLOAD/LauncherArtifacts.cs b/GC-DOWNLOAD/LauncherArtifacts.cs index 2223743..de5f332 100644 --- a/GC-DOWNLOAD/LauncherArtifacts.cs +++ b/GC-DOWNLOAD/LauncherArtifacts.cs @@ -47,9 +47,9 @@ public static class LauncherArtifacts return new[] { label, rid }; } - /// 启动器包应有的文件名,如 GC-1.0.10-mac-arm64.zip。 + /// 启动器包应有的文件名,如 GCL-1.0.10-mac-arm64.zip。 public static string PackageFileName(string version, string rid) - => $"GC-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip"; + => $"GCL-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip"; /// /// 判断某个 zip 名是不是「这个版本 + 这个平台」的启动器包。 @@ -58,8 +58,8 @@ public static class LauncherArtifacts public static bool LooksLikePackage(string fileName, string version, string rid) { if (!fileName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)) return false; - // 当前发布包叫 GC-<版本>-<平台>.zip;GCL- 前缀是为下个大版本预留的命名, - // 这里一并认,免得到时候还要再改一次解析。 + // 1.0.10 起发布包统一叫 GCL-<版本>-<平台>.zip;GC- 是老命名, + // 一并认,装过 1.0.9 及更早版本的机器才不会把新包当成「不是启动器包」。 if (!fileName.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase) && !fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false; diff --git a/GC-DOWNLOAD/LauncherUpdater.cs b/GC-DOWNLOAD/LauncherUpdater.cs index b06cb86..fa8e38b 100644 --- a/GC-DOWNLOAD/LauncherUpdater.cs +++ b/GC-DOWNLOAD/LauncherUpdater.cs @@ -367,9 +367,9 @@ public static class LauncherUpdater else if (File.Exists(manifestCopy)) File.Delete(manifestCopy); - // 包名:GC-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。 + // 包名:GCL-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。 // Linux 的启动器没有扩展名,别硬加 .exe —— 那会让按包名查找永远落空。 - var packageName = $"GC-{latest}-{PlatformLabel}" + + var packageName = $"GCL-{latest}-{PlatformLabel}" + (OperatingSystem.IsMacOS() ? ".app" : OperatingSystem.IsWindows() ? ".exe" : ""); diff --git a/GC-SAVEDOG/Applier.cs b/GC-SAVEDOG/Applier.cs index 08c279a..2d9c875 100644 --- a/GC-SAVEDOG/Applier.cs +++ b/GC-SAVEDOG/Applier.cs @@ -355,7 +355,7 @@ internal sealed class Applier { if (!fileName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return 0; - // 发布包把启动器改名成 GC-<版本>-<系统>-<架构>.exe(GCL- 是预留前缀),先按这个模式认出来。 + // 发布包把启动器改名成 GCL-<版本>-<系统>-<架构>.exe(旧包是 GC-),先按这个模式认出来。 if (VersionedExePattern.IsMatch(fileName)) return 110; var name = Path.GetFileNameWithoutExtension(fileName); diff --git a/GC/src/test/dotnet/GC.Tests/Program.cs b/GC/src/test/dotnet/GC.Tests/Program.cs index 7232b6b..6c369e5 100644 --- a/GC/src/test/dotnet/GC.Tests/Program.cs +++ b/GC/src/test/dotnet/GC.Tests/Program.cs @@ -195,7 +195,7 @@ internal static class Program Directory.CreateDirectory(stage); // Linux 的启动器没有扩展名,测试包名要跟着平台走 var launcherExt = OperatingSystem.IsWindows() ? ".exe" : ""; - File.WriteAllText(Path.Combine(stage, "GC-9.9.9-" + LauncherUpdater.PlatformLabel + launcherExt), + File.WriteAllText(Path.Combine(stage, "GCL-9.9.9-" + LauncherUpdater.PlatformLabel + launcherExt), "new launcher"); var zip = Path.Combine(tmp, "GC-" + rid + ".zip"); ZipFile.CreateFromDirectory(stage, zip); @@ -245,7 +245,7 @@ internal static class Program // 清单不写 url、不写 path,只给 dir + name + sha256,客户端要能自己找过去。 var distDir = Path.Combine(remote, "dist", LauncherUpdater.PlatformLabel); Directory.CreateDirectory(distDir); - var distName = "GC-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip"; + var distName = "GCL-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip"; var distZip = Path.Combine(distDir, distName); File.Copy(zip, distZip, true); diff --git a/README.md b/README.md index 222a0f7..f737098 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run ``` <解压出来的目录>/ ← 压缩包里只有这一个文件夹 - GC-<版本>-<平台>(.exe | .app/) 启动器 + GCL-<版本>-<平台>(.exe | .app/) 启动器 GC-UI(.exe) Flutter 前端 safedog/GC-SAVEDOG[.exe] 更新守护进程(运行时复制到 .GC/safedog) data/ lib/ *.dll 后端与 Flutter 运行时 @@ -225,8 +225,8 @@ Repository/ | 方式 | 清单字段 | 说明 | | --- | --- | --- | -| Release 附件(推荐) | `url` | `.../releases/download/<版本>/GC-<版本>-<系统>-<架构>.zip` | -| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GC-<版本>-<系统>-<架构>.zip` | +| Release 附件(推荐) | `url` | `.../releases/download/<版本>/GCL-<版本>-<系统>-<架构>.zip` | +| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GCL-<版本>-<系统>-<架构>.zip` | 下载端按 `url` → `path` → `dist/<系统>-<架构>/` 目录扫描的顺序尝试, **每个候选都必须与清单里的 `sha256` 一致**(`sha256` 由签名保护), @@ -252,15 +252,15 @@ Repository/ | 产物 | 平台 | | --- | --- | -| `dist/mac-arm64/GC-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GC-….app`) | -| `dist/win-amd64/GC-<版本>-win-amd64.zip` | Windows x64(单顶层 `GC-…/`,含 Flutter 前端与 `safedog/`) | -| `dist/win-arm64/GC-<版本>-win-arm64.zip` | Windows on ARM 同上 | -| `dist/linux-arm64/GC-<版本>-linux-arm64.zip` | Linux ARM64 同上(启动器无扩展名,需在 aarch64 主机构建) | +| `dist/mac-arm64/GCL-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GCL-….app`) | +| `dist/win-amd64/GCL-<版本>-win-amd64.zip` | Windows x64(单顶层 `GCL-…/`,含 Flutter 前端与 `safedog/`) | +| `dist/win-arm64/GCL-<版本>-win-arm64.zip` | Windows on ARM 同上 | +| `dist/linux-arm64/GCL-<版本>-linux-arm64.zip` | Linux ARM64 同上(启动器无扩展名,需在 aarch64 主机构建) | 平台目录就是「该平台的编译产物目录」:打包完成后只留最终 zip(原始 `.app` / `.exe` 会被挪到 `build/trash/`,下次构建时移出,不做递归删除)。 -发新版:`./build.sh build` → 把 `dist/<平台>/GC-<版本>-<平台>.zip` +发新版:`./build.sh build` → 把 `dist/<平台>/GCL-<版本>-<平台>.zip` 上传到 Gitea Release(tag `v1.0.8`),**或者**直接提交/上传到仓库的 `dist/<平台>/` 目录 → 提交并推送 `version.json` / `model/version.json`。 两种都能被客户端识别,客户端下次启动就会看到更新。 diff --git a/buildsh/build.sh b/buildsh/build.sh index 6204db0..fedcfd4 100644 --- a/buildsh/build.sh +++ b/buildsh/build.sh @@ -142,5 +142,5 @@ bs_build() { progress_step "收尾"; progress_tick 100 progress_done echo "==> 完成,产物:" - ls -lh "$ROOT_DIR"/dist/*/GC-"$VERSION"-*.zip 2>/dev/null || true + ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true } diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index d9265b6..f9d5deb 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -164,10 +164,10 @@ pack_models() { # 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置) # # 产物落点遵循「仓库 dist/<系统>-<架构>/」布局: -# dist/mac-arm64/GC-<版本>-mac-arm64.zip -# dist/win-amd64/GC-<版本>-win-amd64.zip -# dist/win-arm64/GC-<版本>-win-arm64.zip -# dist/linux-arm64/GC-<版本>-linux-arm64.zip +# dist/mac-arm64/GCL-<版本>-mac-arm64.zip +# dist/win-amd64/GCL-<版本>-win-amd64.zip +# dist/win-arm64/GCL-<版本>-win-arm64.zip +# dist/linux-arm64/GCL-<版本>-linux-arm64.zip # 启动器更新时既可以从 Release 附件下载,也会到这些目录里找编译产物 # (见 GC-DOWNLOAD/LauncherArtifacts.cs),所以两种发布方式都能用。 # @@ -286,7 +286,7 @@ build_flutter_ui_cross() { } pack_launcher() { - echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)" + echo "==> 生成启动器产物(GCL-<版本>-<系统>-<架构>)" # --- Windows:启动器 + 守护进程 + UI 后端 + Flutter 前端,整目录打包 --- for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do @@ -300,9 +300,9 @@ pack_launcher() { [ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1) [ -n "$EXE" ] || continue - # 包内只有一个顶层目录(GC-<版本>-<平台>),解压后不会散落一屏 dll。 + # 包内只有一个顶层目录(GCL-<版本>-<平台>),解压后不会散落一屏 dll。 TMP="$ROOT_DIR/dist/.winpkg-$LABEL" - PKGNAME="GC-${VERSION}-${LABEL}" + PKGNAME="GCL-${VERSION}-${LABEL}" PKG="$TMP/$PKGNAME" rm -rf "$TMP"; mkdir -p "$PKG" cp -R "$SRC"/. "$PKG"/ @@ -331,7 +331,7 @@ pack_launcher() { SRC="$ROOT_DIR/dist/linux-arm64" if [ -d "$SRC" ]; then TMP="$ROOT_DIR/dist/.linuxpkg" - PKGNAME="GC-${VERSION}-linux-arm64" + PKGNAME="GCL-${VERSION}-linux-arm64" PKG="$TMP/$PKGNAME" rm -rf "$TMP"; mkdir -p "$PKG" cp -R "$SRC"/. "$PKG"/ @@ -357,7 +357,7 @@ pack_launcher() { # --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)--- MACAPP="$ROOT_DIR/dist/mac-arm64/GC.app" if [ -d "$MACAPP" ]; then - FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app" + FINAL="$ROOT_DIR/dist/GCL-${VERSION}-mac-arm64.app" rm -rf "$FINAL" mv "$MACAPP" "$FINAL" chmod +x "$FINAL/Contents/MacOS/GC" 2>/dev/null || true @@ -371,14 +371,14 @@ pack_launcher() { fi # --- 统一压缩:每个产物都打成同名 .zip,放进自己的平台目录 --- - # GC-1.0.3-mac-arm64.app -> dist/mac-arm64/GC-1.0.3-mac-arm64.zip + # GCL-1.0.3-mac-arm64.app -> dist/mac-arm64/GCL-1.0.3-mac-arm64.zip # 客户端下载时按「原名去掉扩展名 + .zip」取包,再解压回原名。 echo "==> 压缩为 zip" - for art in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do + for art in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do [ -e "$art" ] || continue base=$(basename "$art") name="${base%.*}" # 去掉 .exe / .app - label="${name#GC-${VERSION}-}" # mac-arm64 / win-amd64 + label="${name#GCL-${VERSION}-}" # mac-arm64 / win-amd64 ZIP="$ROOT_DIR/dist/${label}/${name}.zip" mkdir -p "$ROOT_DIR/dist/${label}" rm -f "$ZIP" @@ -400,7 +400,7 @@ pack_launcher() { # 一次性删除又慢又不可逆,先挪走更安全(暂存区在下次构建开始时挪出 dist)。 TRASH="$ROOT_DIR/build/trash" mkdir -p "$TRASH" - for leftover in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do + for leftover in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do [ -e "$leftover" ] || continue mv "$leftover" "$TRASH/$(basename "$leftover")-$(date +%s)" 2>/dev/null || true done @@ -409,7 +409,7 @@ pack_launcher() { stamp_launcher_only echo "" echo "==> dist 里可发布的 zip:" - ls -lh "$ROOT_DIR"/dist/*/GC-"$VERSION"-*.zip 2>/dev/null || true + ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true } # 删除 publish 过程中的中间目录:平台目录里只留最终 zip @@ -417,7 +417,7 @@ strip_intermediate_dirs() { for d in win-amd64 win-x64 win-arm64 mac-arm64 linux-arm64 linux-x64; do [ -d "$ROOT_DIR/dist/$d" ] || continue find "$ROOT_DIR/dist/$d" -mindepth 1 -maxdepth 1 \ - ! -name "GC-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true + ! -name "GCL-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true done find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true } diff --git a/model/version.json b/model/version.json index 0903271..65368f4 100644 --- a/model/version.json +++ b/model/version.json @@ -1,6 +1,6 @@ { "schema": 1, - "generated": "2026-11-18T12:33:25Z", + "generated": "2026-11-18T12:37:25Z", "repository": "https://git.xhmcl.com/Morris/GC", "branch": "main", "modelDir": "model", @@ -9,38 +9,38 @@ "revision": "", "packages": { "win-x64": { - "path": "dist/win-amd64/GC-1.0.10-win-amd64.zip", + "path": "dist/win-amd64/GCL-1.0.10-win-amd64.zip", "dir": "dist/win-amd64", - "name": "GC-1.0.10-win-amd64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-amd64.zip", - "sha256": "a2e581b82ccb61cc05f84f69c7ea7e3cd2e1eab0ed5118047e287453aab54d52", - "size": 74322650 + "name": "GCL-1.0.10-win-amd64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-amd64.zip", + "sha256": "ace717e9a96704c0f51420fc7ee23af01405c239cf9e039352d9864d7fe513b8", + "size": 74323474 }, "win-arm64": { - "path": "dist/win-arm64/GC-1.0.10-win-arm64.zip", + "path": "dist/win-arm64/GCL-1.0.10-win-arm64.zip", "dir": "dist/win-arm64", - "name": "GC-1.0.10-win-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-arm64.zip", - "sha256": "e0a41e49fd7d493ff92b7b5093b9ce5685988fe572cd1eff6cf95bb9a46eeb70", - "size": 72067436 + "name": "GCL-1.0.10-win-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-arm64.zip", + "sha256": "af1337e0ad110ca408141477d17cb33e9a3ea187909d94c5425086d6215ea651", + "size": 72068324 }, "osx-arm64": { - "path": "dist/mac-arm64/GC-1.0.10-mac-arm64.zip", + "path": "dist/mac-arm64/GCL-1.0.10-mac-arm64.zip", "dir": "dist/mac-arm64", - "name": "GC-1.0.10-mac-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-arm64.zip" + "name": "GCL-1.0.10-mac-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-arm64.zip" }, "osx-x64": { - "path": "dist/mac-x64/GC-1.0.10-mac-x64.zip", + "path": "dist/mac-x64/GCL-1.0.10-mac-x64.zip", "dir": "dist/mac-x64", - "name": "GC-1.0.10-mac-x64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-x64.zip" + "name": "GCL-1.0.10-mac-x64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-x64.zip" }, "linux-arm64": { - "path": "dist/linux-arm64/GC-1.0.10-linux-arm64.zip", + "path": "dist/linux-arm64/GCL-1.0.10-linux-arm64.zip", "dir": "dist/linux-arm64", - "name": "GC-1.0.10-linux-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-linux-arm64.zip" + "name": "GCL-1.0.10-linux-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-linux-arm64.zip" } } }, @@ -49,7 +49,7 @@ "id": "contour-map", "version": "1.1", "build": "773ab2161d", - "manifestSha256": "576c4088127982afaefeef6b3cd9ee2c0b062a94967ba854a090986d8136b0b6", + "manifestSha256": "f81d18da03ea3507872468738a3e9bd43e63c884203cae36f213e8dafb3d4027", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" @@ -58,7 +58,7 @@ "id": "earth-geography", "version": "1.9", "build": "cc68b8863b", - "manifestSha256": "fcd38ab5e23bd6faefcdf2d199b0643c1d3c014c789eb862688d588b4434fdb8", + "manifestSha256": "d231450e1d103eb324ba6c78b073782247ce5e1960b6f7697795e18c89e8e888", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" @@ -67,7 +67,7 @@ "id": "earth-revolution", "version": "1.7", "build": "53b7a0fbc3", - "manifestSha256": "fc71fa7f6b524512ab7ad039e0ee759f45b8ac08ccdbca7e93297424fd36b64b", + "manifestSha256": "3e9550fa769a2a52215a7eea53b26e5db13281d1833fc02f83c56ff5b214a949", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" @@ -76,7 +76,7 @@ "id": "earth-rotation", "version": "1.7", "build": "ecd52665f9", - "manifestSha256": "2aabc7a6e35c42b671e5be62b09414628eff08c5646de8d50dd16a25bb804b1c", + "manifestSha256": "ac74d2037ea06b1ce758c3187deb37527eec11ce37789e62e4dadf95bf1fdd94", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" @@ -85,7 +85,7 @@ "id": "scale-calculator", "version": "1.6", "build": "105653737d", - "manifestSha256": "971b4438ebbbf4f8042d8ce035f696e713aae532c3b94231a2d9c60c102cef98", + "manifestSha256": "f81bbd3453c56e7547a0fceedf4458a2a9febfb77f7d8eabe03b47e526eedaef", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator" @@ -94,8 +94,8 @@ "signature": { "alg": "ECDSA-P256-SHA256", "keyId": "gc-2026-12", - "value": "6mZUj+t6AExyLQbauvQSLCicUFUbesPGs0jTd6FGwjm+mxEud7e+0fvmmdo+HDFZY6NifIrVENIB6Q5TlLVS7g==", - "contentSha256": "76cabe2d25001bf0a07aadc831bb6222bc00ed0114cde1e83ac8e29db6069a55", - "signedAt": "2026-11-18T12:33:26Z" + "value": "4k5CD5awa6iiLoZDDTQbpUEs3qnA1GBNit66T0IOMmKzHpHFmd1oaMGiQFFMDL+LHnKoKooWcF6G8HnaQv3hig==", + "contentSha256": "26aa159b440dd0f1d2e912c959059e8f7df6aa9ecd7c1c53fde8915239134b19", + "signedAt": "2026-11-18T12:38:10Z" } } diff --git a/version.json b/version.json index 0903271..65368f4 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "schema": 1, - "generated": "2026-11-18T12:33:25Z", + "generated": "2026-11-18T12:37:25Z", "repository": "https://git.xhmcl.com/Morris/GC", "branch": "main", "modelDir": "model", @@ -9,38 +9,38 @@ "revision": "", "packages": { "win-x64": { - "path": "dist/win-amd64/GC-1.0.10-win-amd64.zip", + "path": "dist/win-amd64/GCL-1.0.10-win-amd64.zip", "dir": "dist/win-amd64", - "name": "GC-1.0.10-win-amd64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-amd64.zip", - "sha256": "a2e581b82ccb61cc05f84f69c7ea7e3cd2e1eab0ed5118047e287453aab54d52", - "size": 74322650 + "name": "GCL-1.0.10-win-amd64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-amd64.zip", + "sha256": "ace717e9a96704c0f51420fc7ee23af01405c239cf9e039352d9864d7fe513b8", + "size": 74323474 }, "win-arm64": { - "path": "dist/win-arm64/GC-1.0.10-win-arm64.zip", + "path": "dist/win-arm64/GCL-1.0.10-win-arm64.zip", "dir": "dist/win-arm64", - "name": "GC-1.0.10-win-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-win-arm64.zip", - "sha256": "e0a41e49fd7d493ff92b7b5093b9ce5685988fe572cd1eff6cf95bb9a46eeb70", - "size": 72067436 + "name": "GCL-1.0.10-win-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-win-arm64.zip", + "sha256": "af1337e0ad110ca408141477d17cb33e9a3ea187909d94c5425086d6215ea651", + "size": 72068324 }, "osx-arm64": { - "path": "dist/mac-arm64/GC-1.0.10-mac-arm64.zip", + "path": "dist/mac-arm64/GCL-1.0.10-mac-arm64.zip", "dir": "dist/mac-arm64", - "name": "GC-1.0.10-mac-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-arm64.zip" + "name": "GCL-1.0.10-mac-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-arm64.zip" }, "osx-x64": { - "path": "dist/mac-x64/GC-1.0.10-mac-x64.zip", + "path": "dist/mac-x64/GCL-1.0.10-mac-x64.zip", "dir": "dist/mac-x64", - "name": "GC-1.0.10-mac-x64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-mac-x64.zip" + "name": "GCL-1.0.10-mac-x64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-mac-x64.zip" }, "linux-arm64": { - "path": "dist/linux-arm64/GC-1.0.10-linux-arm64.zip", + "path": "dist/linux-arm64/GCL-1.0.10-linux-arm64.zip", "dir": "dist/linux-arm64", - "name": "GC-1.0.10-linux-arm64.zip", - "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GC-1.0.10-linux-arm64.zip" + "name": "GCL-1.0.10-linux-arm64.zip", + "url": "https://git.xhmcl.com/Morris/GC/releases/download/1.0.10/GCL-1.0.10-linux-arm64.zip" } } }, @@ -49,7 +49,7 @@ "id": "contour-map", "version": "1.1", "build": "773ab2161d", - "manifestSha256": "576c4088127982afaefeef6b3cd9ee2c0b062a94967ba854a090986d8136b0b6", + "manifestSha256": "f81d18da03ea3507872468738a3e9bd43e63c884203cae36f213e8dafb3d4027", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" @@ -58,7 +58,7 @@ "id": "earth-geography", "version": "1.9", "build": "cc68b8863b", - "manifestSha256": "fcd38ab5e23bd6faefcdf2d199b0643c1d3c014c789eb862688d588b4434fdb8", + "manifestSha256": "d231450e1d103eb324ba6c78b073782247ce5e1960b6f7697795e18c89e8e888", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" @@ -67,7 +67,7 @@ "id": "earth-revolution", "version": "1.7", "build": "53b7a0fbc3", - "manifestSha256": "fc71fa7f6b524512ab7ad039e0ee759f45b8ac08ccdbca7e93297424fd36b64b", + "manifestSha256": "3e9550fa769a2a52215a7eea53b26e5db13281d1833fc02f83c56ff5b214a949", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" @@ -76,7 +76,7 @@ "id": "earth-rotation", "version": "1.7", "build": "ecd52665f9", - "manifestSha256": "2aabc7a6e35c42b671e5be62b09414628eff08c5646de8d50dd16a25bb804b1c", + "manifestSha256": "ac74d2037ea06b1ce758c3187deb37527eec11ce37789e62e4dadf95bf1fdd94", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" @@ -85,7 +85,7 @@ "id": "scale-calculator", "version": "1.6", "build": "105653737d", - "manifestSha256": "971b4438ebbbf4f8042d8ce035f696e713aae532c3b94231a2d9c60c102cef98", + "manifestSha256": "f81bbd3453c56e7547a0fceedf4458a2a9febfb77f7d8eabe03b47e526eedaef", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator" @@ -94,8 +94,8 @@ "signature": { "alg": "ECDSA-P256-SHA256", "keyId": "gc-2026-12", - "value": "6mZUj+t6AExyLQbauvQSLCicUFUbesPGs0jTd6FGwjm+mxEud7e+0fvmmdo+HDFZY6NifIrVENIB6Q5TlLVS7g==", - "contentSha256": "76cabe2d25001bf0a07aadc831bb6222bc00ed0114cde1e83ac8e29db6069a55", - "signedAt": "2026-11-18T12:33:26Z" + "value": "4k5CD5awa6iiLoZDDTQbpUEs3qnA1GBNit66T0IOMmKzHpHFmd1oaMGiQFFMDL+LHnKoKooWcF6G8HnaQv3hig==", + "contentSha256": "26aa159b440dd0f1d2e912c959059e8f7df6aa9ecd7c1c53fde8915239134b19", + "signedAt": "2026-11-18T12:38:10Z" } } -- 2.54.0