From 2ee9d7e66de618dd1d5071d90ba6ca4658b04f01 Mon Sep 17 00:00:00 2001 From: cflmy Date: Thu, 17 Sep 2026 10:20:37 +0800 Subject: [PATCH] =?UTF-8?q?release:=20v1.0.3=20=E2=80=94=20PPA,=20ext=20CD?= =?UTF-8?q?N,=20synced=20CLI+ext=20packs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .github/workflows/release.yml | 4 ++-- CHANGELOG.md | 25 ++++++++++++++++++++++++- Cargo.lock | 4 ++-- Cargo.toml | 2 +- README.md | 8 ++++---- crates/marqdo-wasm/Cargo.toml | 2 +- debian/changelog | 6 ++++++ ext/VERSION | 2 +- 8 files changed, 41 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47660c5..5522f68 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -124,8 +124,8 @@ jobs: ## Marqdo ${{ github.ref_name }} ### 亮点 / Highlights - - **v1.0.2**:表驱动页面引言 `compose_intro` / `引言装配`;web-site Demo 与后台门禁加固 - - **v1.0.2**: table-bound page intro (`compose_intro`); web-site demo + desk auth polish + - **v1.0.3**:Ubuntu PPA + 扩展 CDN(ext.marqdo.com);CLI/扩展可分发;noble 捆绑 Rust 工具链 + - **v1.0.3**: Ubuntu PPA + extension CDN; independent CLI/ext packs; bundled Rust for noble - **v1.0.1**:修复 Go `libweb` 动态路由 `{param}` 查询代入、详情 Markdown、CSS 数字误报 - **Linux 包必出**:`*-native-x86_64-unknown-linux-gnu.zip` + Linux CLI bundle - Details: [CHANGELOG](https://github.com/cflmy/marqdo/blob/main/CHANGELOG.md) · [mapping v0.3](https://github.com/cflmy/marqdo/blob/main/doc/design/markdown-mapping-v0.3.md) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc5a752..59e2d68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,33 @@ ## Unreleased +### Added + +### Fixed + +### Changed + +## v1.0.3 — 2026-09-17 + +### Highlights + +**分发渠道齐备**:Ubuntu PPA 装 CLI;扩展包走 CDN(`ext.marqdo.com`)与 GitHub;CLI 与扩展可分开发版。本版 CLI 与扩展包 **同步为 1.0.3**。 + +```bash +# Ubuntu +sudo add-apt-repository ppa:cflmy/marqdo +sudo apt update && sudo apt install marqdo +marqdo ext add web + +# 或源码 / Releases +git checkout v1.0.3 && cargo build --release +``` + ### Added - Ubuntu PPA packaging: `debian/` + `scripts/ppa-ship.sh` (一键装工具/打包/dput) + `ppa-build-source.sh` + [ubuntu-ppa.md](doc/design/ubuntu-ppa.md). - **Extension CDN** (`https://ext.marqdo.com` / Cloudflare R2):`ext add` 下载顺序改为 CDN → GitHub → proxy;独立包版本见 `ext/VERSION` 与 CDN `latest/VERSION`;上传脚本 `scripts/upload-ext-r2.py`(凭据 `~/.marqdo/r2.env`)。设计见 [ext-cdn.md](doc/design/ext-cdn.md)。 - `ext add` 下载:GitHub 失败后自动回退 `https://proxy.cflmy.top/github.com/…`;可用 `MARQDO_EXT_DOWNLOAD_BASE` 指定首选镜像;加长读写超时。 +- 用户文档(README / `public/00-欢迎` / `features/05-扩展`)标明安装渠道:Ubuntu PPA、GitHub Releases、源码;扩展走 CDN。 ### Fixed - `ext/` 导入默认搜索 `~/.marqdo/ext`(与 `marqdo ext add` 安装根一致),无需再手动 `export MARQDO_EXT`。 @@ -13,7 +36,7 @@ ### Changed - 允许 **CLI 与扩展包分开发版**:扩展包 SemVer 可与 `Cargo.toml` 不同(`MARQDO_EXT_VERSION` / `ext/VERSION` / CDN latest)。 -- 用户文档(README / `public/00-欢迎` / `features/05-扩展`)标明安装渠道:Ubuntu PPA、GitHub Releases、源码;扩展走 CDN。 +- 发版 skill:支持 `full` / `cli` / `ext`;扩展必传 R2+GitHub;CLI 走 PPA;需用户操作时打印确切命令。 ## v1.0.2 — 2026-09-16 diff --git a/Cargo.lock b/Cargo.lock index 2e41a16..1108d29 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -572,7 +572,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "marqdo" -version = "1.0.2" +version = "1.0.3" dependencies = [ "anyhow", "assert_cmd", @@ -603,7 +603,7 @@ dependencies = [ [[package]] name = "marqdo-wasm" -version = "1.0.2" +version = "1.0.3" dependencies = [ "marqdo", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 5fb0451..b44d073 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo" -version = "1.0.2" +version = "1.0.3" edition = "2021" license = "Apache-2.0" description = "Marqdo — Markdown markers as an interpreted programming language" diff --git a/README.md b/README.md index 263b977..26b0b50 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ marqdo catalog public -o .marqdo --- -## 现状(v1.0.2) +## 现状(v1.0.3) - 映射与解释器:**v0.3 语法宪法**(`**` 代码 / `*` 返回 / 叙述声明);Phase I 树遍历 + 字节码后端;金样例在 `tests/` 与 `tests/markup-v03/` - **对象**:`#` = 类型/构造,`##`+ = 函数/方法;见 [objects.md](doc/design/objects.md) @@ -120,7 +120,7 @@ marqdo catalog public -o .marqdo - **浏览器 Marqdo(WASM)**:`marqdo wasm build` + 官方 bridge 自启(作者零业务 JS;桥内可含列表/路由/storage/ws/文件/Canvas/音频/Observer/拖放);`lib/browser` + GFM;`web.client_embed`;示例 [browser-hello](examples/browser-hello/) · [browser-app](examples/browser-app/) · [browser-media](examples/browser-media/) · [web-client-site](examples/web-client-site/)([ADR 0002](doc/adr/0002-browser-marqdo-wasm.md) · [D](doc/roadmap/browser-wasm-d.md) · [E](doc/roadmap/browser-wasm-e.md) · [F](doc/roadmap/browser-wasm-f.md)) - 选型:[ADR 0001 — Rust](doc/adr/0001-implementation-language.md) · [ADR 0002 — 浏览器 WASM](doc/adr/0002-browser-marqdo-wasm.md)(C0–C5 完结,见 [roadmap/browser-wasm.md](doc/roadmap/browser-wasm.md))· [ADR 0003 — 异步效应](doc/adr/0003-browser-async-effects.md) -### 如何使用最新 Marqdo(v1.0.2) +### 如何使用最新 Marqdo(v1.0.3) **安装解释器(任选其一)** @@ -135,7 +135,7 @@ marqdo catalog public -o .marqdo ```bash # 1) 源码安装(跟 tag 或 main) git clone https://github.com/cflmy/marqdo.git && cd marqdo -git checkout v1.0.2 # 或留在 main +git checkout v1.0.3 # 或留在 main cargo build --release export PATH="$PWD/target/release:$PATH" marqdo version @@ -169,7 +169,7 @@ marqdo wasm build # → dist/wasm/ … 见 examples/browser-hello/ # 6) Releases:Windows exe/zip/vsix;Linux CLI zip + native `.so` zip -# https://github.com/cflmy/marqdo/releases/tag/v1.0.2 +# https://github.com/cflmy/marqdo/releases/tag/v1.0.3 ``` 开发期也可用 `cargo run -- …` 代替已安装的 `marqdo`: diff --git a/crates/marqdo-wasm/Cargo.toml b/crates/marqdo-wasm/Cargo.toml index ad8fc8d..4d82d52 100644 --- a/crates/marqdo-wasm/Cargo.toml +++ b/crates/marqdo-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "marqdo-wasm" -version = "1.0.2" +version = "1.0.3" edition = "2021" license = "Apache-2.0" description = "Marqdo interpreter as WebAssembly (browser host bridge)" diff --git a/debian/changelog b/debian/changelog index 93a3b61..a31def3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +marqdo (1.0.3-1ppa1) noble; urgency=medium + + * Marqdo 1.0.3: PPA + ext CDN docs; bundled Rust for noble builds. + + -- cflmy Thu, 17 Sep 2026 10:30:00 +0800 + marqdo (1.0.2-1ppa2) noble; urgency=medium * Bundle Rust toolchain in orig (third_party/rust) so noble can build diff --git a/ext/VERSION b/ext/VERSION index 6d7de6e..21e8796 100644 --- a/ext/VERSION +++ b/ext/VERSION @@ -1 +1 @@ -1.0.2 +1.0.3