Skip to content

Commit de8801b

Browse files
committed
fix: 表形式的依赖版本没跟着迁,并补上整个漏掉的 llamacpp-metal
CI 抓到三个分片红在 `opencv.opencv@0.0.10` / `@0.0.9` —— 命名空间迁了、版本没迁。 原因是我的替换只写了裸字符串形式 `opencv = "0.0.10"`,而这两个成员用的是表形式 `opencv = { version = "0.0.10", features = ["dnn"] }`。**为一种语法形式写替换,却假 设它覆盖了全部。** 于是不再逐个猜,改用全量扫描找残留 —— 结果比 CI 报的更多:`llamacpp-metal` 根本 不在我上一轮的成员清单里,`[indices]` 键、依赖段、版本三处都没迁。 修复过程中我自己又引入一个:那条 `version = "0.1.0"` 的无差别替换把成员**自身**的包 版本也改成了 b10069。是靠"每个成员的 [indices] 键必须与其依赖段命名空间一致"这条普 查发现的,不是靠信任修复。已还原为 0.1.0。 复核: * 残留扫描清零 * 全成员 indices 键与依赖命名空间逐一对齐 * 三个被改文件的包自身版本均为 0.1.0 * lint(语法 / 身份形态 / mirror urls)PASS * 七个迁移描述符的版本键覆盖三平台;grpc 是 2 平台,这是它 compat.openssl 无 windows 条目的既有例外,不是遗漏
1 parent a36f90d commit de8801b

4 files changed

Lines changed: 11 additions & 8 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ tests/examples/*/mcpp.lock
88
tests/examples/build-mcpp/src/generated.cpp
99
imgui.ini
1010
tests/examples/*/imgui.ini
11+
12+
# 本地 git worktree(逐包验证时开的),不属于索引内容
13+
.worktrees/
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Metal is supported only by the macOS ARM64 leg of the workspace matrix.
22
[indices]
3-
default = { path = "../../.." }
3+
ggml-org = { path = "../../.." }
44

55
[package]
66
name = "llamacpp-metal-tests"
77
version = "0.1.0"
88

9-
[target.'cfg(macos)'.dependencies]
10-
llamacpp = { version = "0.1.0", features = ["backend-metal"] }
9+
[target.'cfg(macos)'.dependencies.ggml-org]
10+
llamacpp = { version = "b10069", features = ["backend-metal"] }

tests/examples/opencv-module-dnn/mcpp.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ name = "opencv-module-dnn-tests"
1414
version = "0.1.0"
1515

1616
[target.'cfg(linux)'.dependencies.opencv]
17-
opencv = { version = "0.0.10", features = ["dnn"] }
17+
opencv = { version = "5.0.0", features = ["dnn"] }
1818

1919
# macOS: `import opencv.dnn;` on macOS-arm64 (per-OS NEON dnn payload).
2020
[target.'cfg(macos)'.dependencies.opencv]
21-
opencv = { version = "0.0.10", features = ["dnn"] }
21+
opencv = { version = "5.0.0", features = ["dnn"] }
2222

2323
# windows: `import opencv.dnn;` on windows-x86_64 (fast_gemm backend).
2424
[target.'cfg(windows)'.dependencies.opencv]
25-
opencv = { version = "0.0.10", features = ["dnn"] }
25+
opencv = { version = "5.0.0", features = ["dnn"] }
2626

2727

tests/examples/opencv-module-unifont/mcpp.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name = "opencv-module-unifont-tests"
1313
version = "0.1.0"
1414

1515
[target.'cfg(linux)'.dependencies.opencv]
16-
opencv = { version = "0.0.9", features = ["unifont"] }
16+
opencv = { version = "5.0.0", features = ["unifont"] }
1717

1818
[target.'cfg(macos)'.dependencies.opencv]
19-
opencv = { version = "0.0.9", features = ["unifont"] }
19+
opencv = { version = "5.0.0", features = ["unifont"] }

0 commit comments

Comments
 (0)