From 7e59711a222f6e971eba38def840d44876ab3e07 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Fri, 2 Oct 2026 10:31:31 -0700 Subject: [PATCH] Repin the runtime to Octoscript-Makepad 62760863 (makepad 39a9de88, Octoscript 5991dfae) The org-wide makepad release after makepad #75-#93 without #90 (Octoscript-Makepad #70). Its runtime.json also pins Octoscript 5991dfae, and setup-native.py's consumer check rejects a Cargo.toml git rev that differs from the runtime, so octoscript-core moves to 5991dfae with it. That brings OctoScript #53 (model-written text in text slots, strict actions, in-card chat; octoscript-ui-l0 via octoscript-core) into this repo's card checking. Cargo.lock is unchanged; makepad-script, the only makepad crate here, has no changed files in 1f3b1ded..39a9de88. Co-Authored-By: Claude Opus 5.5 --- README.md | 4 ++-- README.zh-CN.md | 2 +- crates/octoscript-oh-arkui/Cargo.toml | 2 +- crates/octoscript-oh-webview/Cargo.toml | 2 +- native-runtime.lock.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d8a9967..0c163c4 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ to check the local dependency graph. Existing platform rendering backends remain part of their applications; the framework controls the shared VM and UI sources. **Runtime lock (fixed [#67](https://github.com/OctoSense-org/OctoScript-OH/issues/67), 2026-09-26):** the lock and the matching -Cargo revs now select Octoscript-Makepad `cb66de07`, a commit on its `main` -(makepad `1f3b1ded`, Octoscript `dbd48cfb`: the same framework sources as the +Cargo revs now select Octoscript-Makepad `62760863`, a commit on its `main` +(makepad `39a9de88`, Octoscript `5991dfae`: the same framework sources as the other OctoSense consumers). The previous pin, `b1596d9c`, was the pre-history-rewrite hash of main's `f4acc6c`; nothing was lost in the move. diff --git a/README.zh-CN.md b/README.zh-CN.md index a0d17f5..16ae97c 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -18,7 +18,7 @@ OctoSense 外壳、App Hub 的 `card-host`、Mail 以及其他 OctoSense 应用 检查本地依赖图。现有的各平台渲染后端仍然属于各自的应用;框架负责的是共享的 VM 和 UI 源码。 **运行时锁定([#67](https://github.com/OctoSense-org/OctoScript-OH/issues/67) 已于 2026-09-26 修复):** 锁文件和对应的 Cargo 版本现在选定 -Octoscript-Makepad `cb66de07`,它在该仓库的 `main` 上(makepad `1f3b1ded`、Octoscript `dbd48cfb`, +Octoscript-Makepad `62760863`,它在该仓库的 `main` 上(makepad `39a9de88`、Octoscript `5991dfae`, 与其他 OctoSense 使用方的框架源码相同)。之前锁定的 `b1596d9c` 是 main 上 `f4acc6c` 在历史重写之前的哈希,迁移没有丢失任何内容。 diff --git a/crates/octoscript-oh-arkui/Cargo.toml b/crates/octoscript-oh-arkui/Cargo.toml index dfdde9b..6cc29c2 100644 --- a/crates/octoscript-oh-arkui/Cargo.toml +++ b/crates/octoscript-oh-arkui/Cargo.toml @@ -14,7 +14,7 @@ crate-type = ["rlib"] [dependencies] # The Octoscript VM, via ymote/Octoscript rather than straight from makepad. -octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "dbd48cfb799551c11e30970c393777d29644a605" } +octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" } serde_json = "1.0.151" [build-dependencies] diff --git a/crates/octoscript-oh-webview/Cargo.toml b/crates/octoscript-oh-webview/Cargo.toml index cad21c4..32aaf95 100644 --- a/crates/octoscript-oh-webview/Cargo.toml +++ b/crates/octoscript-oh-webview/Cargo.toml @@ -29,7 +29,7 @@ octoscript-oh-core = { path = "../octoscript-oh-core" } # not in octoscript-oh-core -- see the module docs there. octoscript-oh-plugin-demo = { path = "../octoscript-oh-plugin-demo" } # The Octoscript VM, via ymote/Octoscript rather than straight from makepad. -octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "dbd48cfb799551c11e30970c393777d29644a605" } +octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "5991dfae9344589e732b2605b530f788e8bbcd11" } napi-derive-ohos = "0.0.9" napi-ohos = "0.1.3" serde = { version = "1", features = ["derive"] } diff --git a/native-runtime.lock.json b/native-runtime.lock.json index be5bbb0..e2e2c44 100644 --- a/native-runtime.lock.json +++ b/native-runtime.lock.json @@ -1,5 +1,5 @@ { "schema_version": 1, "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git", - "revision": "cb66de073469063abeb2a5ab2a2bbf3cdb365745" + "revision": "62760863bc992aeb7b43692b10d479417b4d3d93" }