From 7241f53aa7d13eb139225934ed0faea035ca50b9 Mon Sep 17 00:00:00 2001 From: sunrisepeak Date: Thu, 6 Aug 2026 19:20:48 +0800 Subject: [PATCH] =?UTF-8?q?bump(grpc):=20=E4=B8=89=E4=B8=AA=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E7=AC=A6=E6=8C=87=E5=90=91=20v1.83.0-3=20=E2=80=94?= =?UTF-8?q?=E2=80=94=20codegen=20=E5=B7=A5=E5=85=B7=E9=93=BE=E7=94=B1=20gr?= =?UTF-8?q?pc=20=E5=8C=85=E4=BA=A4=E7=BB=99=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit grpc-m v1.83.0-3 起,使用者写一条依赖而不是四条: [dependencies.grpc] grpc = { version = "1.83.0", features = ["codegen"] } import mcpp; import grpcgen; int main() { return grpcgen::generate_all() ? 0 : 1; } grpc 的 [feature-deps.codegen] 用 reexport = true 把 protoc、grpc_cpp_plugin 与 grpcgen 规则模块交给消费者;generate_all() 借 rerun_if_changed_glob 扫 proto/。两者都需要 mcpp 2026.8.6.2(mcpp#359),CI pin 同步提到该版本。 index.toml 的 min_mcpp **不动**。旧客户端仍能加载 grpc 的 manifest —— 2026.8.6.2 起不认识的依赖键降级而非让整份加载失败 —— 只是拿不到工具链,且 grpcgen 会明确 说出来。为一个包抬全局下限正是 mcpp#349 修掉的那个错误。 tarball 已核验:GitHub 与 GitCode 两端同为 9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f(4073680 字节), CN 那份是本地上传后回探下载重算得到的,不是读 sidecar。 tests/examples/grpc-codegen 成员单独开 PR:它要证明的是「reexport 经由**已发布** 索引到达消费者」,而在本 PR 的 CI 里 mcpplibs.grpcgen 仍解析到线上的 -2(本仓库 的 [indices] 每个成员只能重定向一个命名空间 —— mcpp#238 / xlings#374)。先发布, 再验证。 --- .github/workflows/validate.yml | 2 +- pkgs/g/grpc-plugin.lua | 18 +++++++++--------- pkgs/g/grpc.lua | 12 ++++++------ pkgs/g/grpcgen.lua | 18 +++++++++--------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index abeffcd..d118a3d 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -127,7 +127,7 @@ env: # index.toml 的 min_mcpp **不动**。两个会撞的 compat 邻居都是 Form B,所以旧客户端 # 撞上时是响亮报错而不是静默用错包;下限是一道让整个索引对旧客户端失效的闸门 # (mcpp#349),只该在描述符真的读不动时抬。这里读得动,差的是解析得对。 - MCPP_VERSION: "2026.8.6.1" + MCPP_VERSION: "2026.8.6.2" jobs: lint: diff --git a/pkgs/g/grpc-plugin.lua b/pkgs/g/grpc-plugin.lua index e1260cc..ae9da6d 100644 --- a/pkgs/g/grpc-plugin.lua +++ b/pkgs/g/grpc-plugin.lua @@ -31,28 +31,28 @@ package = { linux = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, macosx = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, windows = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, }, diff --git a/pkgs/g/grpc.lua b/pkgs/g/grpc.lua index 0db3880..3c2cd09 100644 --- a/pkgs/g/grpc.lua +++ b/pkgs/g/grpc.lua @@ -58,19 +58,19 @@ package = { linux = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, macosx = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, -- No windows block, and the reason is a DEPENDENCY rather than gRPC: diff --git a/pkgs/g/grpcgen.lua b/pkgs/g/grpcgen.lua index adc103b..eb7d01f 100644 --- a/pkgs/g/grpcgen.lua +++ b/pkgs/g/grpcgen.lua @@ -31,28 +31,28 @@ package = { linux = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, macosx = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, windows = { ["1.83.0"] = { url = { - GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-2.tar.gz", - CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-2.tar.gz", + GLOBAL = "https://github.com/mcpplibs/grpc-m/archive/refs/tags/v1.83.0-3.tar.gz", + CN = "https://gitcode.com/mcpp-res/grpc/releases/download/1.83.0/grpc-m-1.83.0-3.tar.gz", }, - sha256 = "9083a85879f67b726d68130ca8374e791e3cc73f9fff8d324cde11314c70b06e", + sha256 = "9a0514a325e348fb013a89bb7b1acb9b41f42d5e9f3c92cee8be788e1e48d74f", }, }, },