Compare commits
192
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
33df185e04 | ||
|
|
f8d2f0a9d6 | ||
|
|
c952765845 | ||
|
|
8440e563e8 | ||
|
|
a5a9001a54 | ||
|
|
074c4e4994 | ||
|
|
5d6b8e66b8 | ||
|
|
1d7d376396 | ||
|
|
d919e886d8 | ||
|
|
4bec0f809e | ||
|
|
cba6218cdb | ||
|
|
97b38c6311 | ||
|
|
65b876d6d7 | ||
|
|
d67689f295 | ||
|
|
f84e79250c | ||
|
|
1b0ca8e3c8 | ||
|
|
de1716cc8d | ||
|
|
eab44128f9 | ||
|
|
024b6b5bec | ||
|
|
ec80b00b15 | ||
|
|
e282dae2b8 | ||
|
|
e2953153dd | ||
|
|
52c7690324 | ||
|
|
a5c250641d | ||
|
|
0f54b33971 | ||
|
|
3cb85fc48e | ||
|
|
a49a507c21 | ||
|
|
176ba3832b | ||
|
|
05ef930878 | ||
|
|
bfe7d73862 | ||
|
|
21f1003450 | ||
|
|
eda0bad6d5 | ||
|
|
07623f613f | ||
|
|
8aa6a70fe9 | ||
|
|
57e060477a | ||
|
|
cd07e9a959 | ||
|
|
261b2d77ed | ||
|
|
ec567a70e6 | ||
|
|
e125636767 | ||
|
|
4981a77d5e | ||
|
|
9b82044b69 | ||
|
|
8f5d3e1a03 | ||
|
|
d0d9b7a9c0 | ||
|
|
bb41674665 | ||
|
|
bf546eb62d | ||
|
|
6a2d0067ad | ||
|
|
c61af4b829 | ||
|
|
1965faf189 | ||
|
|
b982c1dbe0 | ||
|
|
a2629068fd | ||
|
|
2f79ffd646 | ||
|
|
c09dcc50b2 | ||
|
|
5ee23d8fc8 | ||
|
|
8f9b8cbf34 | ||
|
|
fcc4d27856 | ||
|
|
7881cd4663 | ||
|
|
65779ef2ae | ||
|
|
6f4575e4d5 | ||
|
|
4a142843c8 | ||
|
|
9956f2ff1f | ||
|
|
761f35201d | ||
|
|
5b785a196c | ||
|
|
15ae30ff70 | ||
|
|
e6b9e4f83b | ||
|
|
d4514f7b0c | ||
|
|
a8e7b1bb05 | ||
|
|
167d2fadda | ||
|
|
bf80f4527e | ||
|
|
7436ecaa3e | ||
|
|
a46f01b906 | ||
|
|
ca92b031b1 | ||
|
|
3a5c7478a0 | ||
|
|
ccf513aa4b | ||
|
|
e242870d0f | ||
|
|
dba9b31726 | ||
|
|
32859c48d3 | ||
|
|
1cd0ddaa50 | ||
|
|
16d9cc1610 | ||
|
|
1f730ad4fd | ||
|
|
8dede5b888 | ||
|
|
ff1887d6a3 | ||
|
|
54f38b1b40 | ||
|
|
92fee48910 | ||
|
|
4e61b33c90 | ||
|
|
e5da4e90fd | ||
|
|
b9fc9f1dbf | ||
|
|
e833898fb5 | ||
|
|
d8182ae405 | ||
|
|
e48172153c | ||
|
|
6807600404 | ||
|
|
986ddb0040 | ||
|
|
9e09a4434f | ||
|
|
668c465658 | ||
|
|
57a57745da | ||
|
|
38785c5960 | ||
|
|
8c93c9711b | ||
|
|
1763891ba9 | ||
|
|
faafc75129 | ||
|
|
c0ac1f4599 | ||
|
|
35bd542a04 | ||
|
|
df9f7fea84 | ||
|
|
a198cbfdd0 | ||
|
|
9d41779c22 | ||
|
|
553bf1aeb0 | ||
|
|
9e181704f5 | ||
|
|
88295a40c9 | ||
|
|
9072e1b8a7 | ||
|
|
4b2f3c8e15 | ||
|
|
edd477c967 | ||
|
|
270d8b8148 | ||
|
|
a1a933b112 | ||
|
|
d99d6e46d4 | ||
|
|
40b87bd15e | ||
|
|
7d00043236 | ||
|
|
ebe795f847 | ||
|
|
50786ddea0 | ||
|
|
42600c8a2c | ||
|
|
8e41337e17 | ||
|
|
b168e56dd0 | ||
|
|
26fc74646c | ||
|
|
70249bc972 | ||
|
|
a1fd279641 | ||
|
|
51aa97fb2c | ||
|
|
7ac2456b76 | ||
|
|
267a304a04 | ||
|
|
c4ccce13c0 | ||
|
|
f25108f04c | ||
|
|
51cb8d52f2 | ||
|
|
ab6c781947 | ||
|
|
4da9e2d775 | ||
|
|
ab6eca1b68 | ||
|
|
24cbc61ca5 | ||
|
|
37ebbfd319 | ||
|
|
6854fcd33b | ||
|
|
4ae150eb7b | ||
|
|
2cdb453547 | ||
|
|
6a9441d188 | ||
|
|
4495021b70 | ||
|
|
c185078bb8 | ||
|
|
a2cab8cdb1 | ||
|
|
663c44ead7 | ||
|
|
21a70198b2 | ||
|
|
cefcc9e0d1 | ||
|
|
0fdc9f1309 | ||
|
|
d9a1df72ab | ||
|
|
d2a44afbd7 | ||
|
|
cc1788ca64 | ||
|
|
ac3777882c | ||
|
|
819051d2af | ||
|
|
77989362ca | ||
|
|
da0fc6a188 | ||
|
|
25833895db | ||
|
|
5c728b6581 | ||
|
|
980309a6e0 | ||
|
|
475a0d6810 | ||
|
|
f18e7691be | ||
|
|
79f3eca2f3 | ||
|
|
c841bfb5dc | ||
|
|
9a22a70db7 | ||
|
|
1e3f56d8e5 | ||
|
|
18dc20e138 | ||
|
|
d38ec25d2c | ||
|
|
dc4acda005 | ||
|
|
a856bc52f4 | ||
|
|
9f7ae6c919 | ||
|
|
6e5f9bafb7 | ||
|
|
206b142444 | ||
|
|
37dff4f757 | ||
|
|
34d90a114a | ||
|
|
1c06ed13e3 | ||
|
|
20f7602eb4 | ||
|
|
12523fea4f | ||
|
|
f52e728c87 | ||
|
|
298e0e00c4 | ||
|
|
7e194b41a3 | ||
|
|
c7ad19b5e1 | ||
|
|
d6485e8b5f | ||
|
|
79d58bb755 | ||
|
|
f4059f57e4 | ||
|
|
ba889ce87f | ||
|
|
5236cf6fa3 | ||
|
|
95cf2e79a2 | ||
|
|
b7a4bb5f57 | ||
|
|
a0b0e01b07 | ||
|
|
1fb87b37c7 | ||
|
|
eb56c0cf02 | ||
|
|
2826924361 | ||
|
|
c989152c6d | ||
|
|
40fd31a34a | ||
|
|
06c54ec4db | ||
|
|
db4a7a848d | ||
|
|
8bf7ace9e3 |
No files matched your search
@@ -1,40 +0,0 @@
|
||||
# Cargo feature compatibility gate.
|
||||
#
|
||||
# `sema` (the core compiler) must build without the `cli` feature. Library
|
||||
# consumers such as qdagent depend on `marqdo` with `default-features = false`,
|
||||
# so any unconditional reference to a `cli`-gated module is a release blocker.
|
||||
# Keep this matrix in sync with the feature graph in Cargo.toml.
|
||||
name: feature-matrix
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
paths:
|
||||
- "src/**"
|
||||
- "Cargo.toml"
|
||||
- "Cargo.lock"
|
||||
- ".github/workflows/feature-matrix.yml"
|
||||
pull_request:
|
||||
paths:
|
||||
- "src/**"
|
||||
- "Cargo.toml"
|
||||
- "Cargo.lock"
|
||||
- ".github/workflows/feature-matrix.yml"
|
||||
workflow_dispatch:
|
||||
|
||||
concurrency:
|
||||
group: feature-matrix-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
lib-feature-matrix:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: dtolnay/rust-toolchain@1.81.0
|
||||
- name: Library builds with no default features
|
||||
run: cargo check --locked --lib --no-default-features
|
||||
- name: Library builds with only the cli feature
|
||||
run: cargo check --locked --lib --no-default-features --features cli
|
||||
- name: Library builds with default features
|
||||
run: cargo check --locked --lib
|
||||
@@ -0,0 +1,91 @@
|
||||
# One-time, fail-closed promotion from verified main to immutable v2.9.0.
|
||||
# GITHUB_TOKEN-created tag pushes do not recursively start tag workflows.
|
||||
# Explicit workflow_dispatch is used to run the existing multi-platform
|
||||
# Release workflow against the immutable tag itself.
|
||||
name: Release v2.9.0 promotion
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
paths:
|
||||
- "Cargo.toml"
|
||||
- "doc/releases/v2.9.0.md"
|
||||
- ".github/workflows/release-v2.9.yml"
|
||||
pull_request:
|
||||
paths:
|
||||
- "Cargo.toml"
|
||||
- "Cargo.lock"
|
||||
- "crates/marqdo-wasm/Cargo.toml"
|
||||
- "ext/VERSION"
|
||||
- "doc/releases/v2.9.0.md"
|
||||
- ".github/workflows/release-v2.9.yml"
|
||||
workflow_dispatch:
|
||||
permissions:
|
||||
contents: write
|
||||
actions: write
|
||||
concurrency:
|
||||
group: release-v2.9-promotion
|
||||
cancel-in-progress: false
|
||||
jobs:
|
||||
verify-and-dispatch:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
persist-credentials: true
|
||||
- uses: dtolnay/rust-toolchain@stable
|
||||
- name: Verify complete, matching release metadata
|
||||
run: |
|
||||
set -euo pipefail
|
||||
python3 - <<'PY'
|
||||
import re, pathlib
|
||||
want = '2.9.0'
|
||||
for file in ['Cargo.toml', 'crates/marqdo-wasm/Cargo.toml']:
|
||||
data = pathlib.Path(file).read_text()
|
||||
assert re.search(r'^version\s*=\s*"2\.9\.0"\s*$', data, re.M), file
|
||||
lock = pathlib.Path('Cargo.lock').read_text()
|
||||
for name in ['marqdo', 'marqdo-wasm']:
|
||||
assert re.search(r'\[\[package\]\]\nname = "'+name+r'"\nversion = "2\.9\.0"', lock), name
|
||||
assert pathlib.Path('ext/VERSION').read_text().strip() == want
|
||||
assert pathlib.Path('doc/releases/v2.9.0.md').exists()
|
||||
PY
|
||||
git diff --exit-code
|
||||
- name: Install pinned Lean checker
|
||||
run: |
|
||||
curl -sSf https://elan.lean-lang.org/elan-init.sh | sh -s -- -y --default-toolchain leanprover/lean4:v4.35.0
|
||||
echo "$HOME/.elan/bin" >> "$GITHUB_PATH"
|
||||
- name: Validate Lean and source-derived proof library
|
||||
run: |
|
||||
lean --version
|
||||
bash scripts/check-proof-library.sh
|
||||
lean doc/verification/skill-proof/MarqdoModularProof.lean
|
||||
lean doc/verification/skill-proof/MarqdoEffects.lean
|
||||
- name: Build and gate source semantics, actual Lean and compatibility
|
||||
env:
|
||||
MARQDO_PROOF_REQUIRE_LEAN: "1"
|
||||
run: |
|
||||
cargo build --locked
|
||||
cargo test --locked --lib knowledge::
|
||||
cargo test --locked --test knowledge_proof
|
||||
cargo test --locked --test prove_lean
|
||||
cargo test --locked --test prove_corpus
|
||||
cargo test --locked --test conformance
|
||||
cargo test --locked --test executable_knowledge
|
||||
cargo test --locked --test release_handbook
|
||||
- name: Create v2.9.0 only once and dispatch full platform release
|
||||
if: github.repository == 'cflmy/marqdo' && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
|
||||
env:
|
||||
GH_TOKEN: ${{ github.token }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if git ls-remote --exit-code --tags origin refs/tags/v2.9.0 >/dev/null 2>&1; then
|
||||
echo "v2.9.0 already exists; refusing to replace or re-dispatch assets"
|
||||
exit 1
|
||||
fi
|
||||
test "$(git rev-parse HEAD)" = "$GITHUB_SHA"
|
||||
git config user.name "github-actions[bot]"
|
||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||
git tag -a v2.9.0 "$GITHUB_SHA" -m "Marqdo v2.9.0 full: Verified Knowledge Compiler"
|
||||
git push origin refs/tags/v2.9.0
|
||||
gh workflow run release.yml --ref v2.9.0
|
||||
echo "Dispatched Release workflow for immutable tag v2.9.0"
|
||||
+1
-17
@@ -1,22 +1,6 @@
|
||||
# Changelog
|
||||
|
||||
## v2.9.1 — 2026-11-18 · Full release / 正式补丁版本
|
||||
|
||||
Marqdo 2.9.1 修复 2.9.0 的库构建回归:`knowledge` 属于核心编译器,不再由 `cli` 特性门控,`default-features = false` 的下游库恢复可编译;并新增 feature-matrix CI 守卫。无运行时语义、插件 ABI 或证书格式变化。
|
||||
|
||||
**EN:** 2.9.1 fixes the 2.9.0 library regression where the core compiler's `knowledge` module was gated on `cli`, breaking `default-features = false` consumers; a feature-matrix CI gate now prevents regressions. No runtime semantics, plugin ABI or certificate format changes.
|
||||
|
||||
### Fixed
|
||||
|
||||
- Library builds with `--no-default-features` again. `sema::ir` unconditionally
|
||||
emits `proof-index.json` / `proof-obligations.json` through `knowledge`, but
|
||||
`knowledge` was gated on `cli`; it is now part of the core compiler, so
|
||||
downstream crates using `default-features = false` no longer hit
|
||||
`E0433: could not find knowledge in the crate root`.
|
||||
- CI: `feature-matrix` checks the library with no features, `cli` only, and
|
||||
default features to prevent feature-gate regressions.
|
||||
|
||||
详情 / Details: [2.9.1 release notes](doc/releases/v2.9.1.md).
|
||||
## Unreleased
|
||||
|
||||
## v2.9.0 — 2026-11-18 · Full release / 正式完整版本
|
||||
|
||||
|
||||
Generated
+3
-3
@@ -1,6 +1,6 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "adler2"
|
||||
@@ -615,7 +615,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
|
||||
|
||||
[[package]]
|
||||
name = "marqdo"
|
||||
version = "2.9.1"
|
||||
version = "2.9.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_cmd",
|
||||
@@ -656,7 +656,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "marqdo-wasm"
|
||||
version = "2.9.1"
|
||||
version = "2.9.0"
|
||||
dependencies = [
|
||||
"marqdo",
|
||||
"serde_json",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo"
|
||||
version = "2.9.1"
|
||||
version = "2.9.0"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo — Markdown markers as an interpreted programming language"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "marqdo-wasm"
|
||||
version = "2.9.1"
|
||||
version = "2.9.0"
|
||||
edition = "2021"
|
||||
license = "Apache-2.0"
|
||||
description = "Marqdo interpreter as WebAssembly (browser host bridge)"
|
||||
|
||||
Vendored
-6
@@ -1,9 +1,3 @@
|
||||
marqdo (2.9.1-1ppa1) noble; urgency=medium
|
||||
|
||||
* Release 2.9.1; see the reviewed upstream CHANGELOG.
|
||||
|
||||
-- Marqdo Maintainers <cflmy@users.noreply.github.com> Wed, 18 Nov 2026 18:43:10 +0800
|
||||
|
||||
marqdo (2.8.0-1ppa1) noble; urgency=medium
|
||||
|
||||
* Release 2.8.0; see the reviewed upstream CHANGELOG.
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
# Marqdo v2.9.1 · Library Feature-Gate Fix / 库可选特性修复
|
||||
|
||||
## 核心更新 · Highlights
|
||||
|
||||
Marqdo 2.9.1 修复 2.9.0 引入的库构建回归:`sema::ir` 在输出 `proof-index.json` 与 `proof-obligations.json` 时无条件使用 `knowledge` 模块,而该模块此前只在 `cli` 特性下编译,导致以 `default-features = false` 依赖本库的下游工程出现 `E0433: could not find knowledge in the crate root`。
|
||||
|
||||
**EN:** Marqdo 2.9.1 fixes a library-build regression introduced in 2.9.0. `sema::ir` unconditionally emits `proof-index.json` and `proof-obligations.json` through the `knowledge` module, but that module was gated on the `cli` feature, so downstream crates depending on the library with `default-features = false` failed with `E0433: could not find knowledge in the crate root`.
|
||||
|
||||
- `knowledge` 现在是核心编译器的一部分,不再由 `cli` 特性门控;CLI 二进制仍由 `required-features = ["cli"]` 约束。
|
||||
- 新增 `feature-matrix` CI:分别用无默认特性、仅 `cli`、默认特性检查库构建,防止特性门控再次回归。
|
||||
- 没有运行时语义、文稿格式、插件 ABI(v2)或证明证书格式的变化。
|
||||
|
||||
## 兼容性 · Compatibility
|
||||
|
||||
- 2.9.0 的 `.mq.md` 文稿、原生插件(ABI v2)和知识证明证书保持兼容,无需迁移。
|
||||
- 下游库可继续使用 `default-features = false`;2.9.0 期间为绕过该回归而启用的 `cli` 特性可以撤销。
|
||||
- 不可变标签 `v2.9.0` 保持不变,本次是同一主线的补丁版本。
|
||||
|
||||
## 验证 · Verification
|
||||
|
||||
- `cargo check --locked --lib --no-default-features`、`--no-default-features --features cli` 与默认特性三种配置均通过。
|
||||
- `cargo test --locked` 全量通过(Linux x86_64 本地环境)。
|
||||
- 下游验证:qdagent 原生插件恢复 `default-features = false` 后重新编译通过,`cargo test` 17 项通过。
|
||||
- 限制:Windows 与 Linux 发布产物由标签触发的 Release 流水线构建;本地验证不代表其他平台已通过,最终以实际流水线结果和资产校验为准。
|
||||
|
||||
## 完整发行产物 · Full distribution
|
||||
|
||||
The `v2.9.1` full packaging workflow produces:
|
||||
- Windows x86_64 native CLI (standalone EXE and bundled ZIP);
|
||||
- Linux x86_64 CLI+libraries bundle;
|
||||
- standard library ZIP, source ZIP and static user-site ZIP;
|
||||
- editor `marqdo-2.9.1.vsix` from the independent editor branch;
|
||||
- both Windows and Linux official native plugin packs, plus the versioned extension source pack when `ext/VERSION` matches `2.9.1`.
|
||||
+1
-1
@@ -1 +1 @@
|
||||
2.9.1
|
||||
2.9.0
|
||||
+1
-4
@@ -19,10 +19,7 @@ pub mod capture;
|
||||
pub mod narrative_ratio;
|
||||
#[cfg(feature = "cli")]
|
||||
pub mod catalog;
|
||||
// `sema::ir` unconditionally emits `proof-index.json` and
|
||||
// `proof-obligations.json` through this module, so it is part of the core
|
||||
// compiler rather than the CLI surface. Gating it on `cli` broke library
|
||||
// consumers that disable default features (E0433).
|
||||
#[cfg(feature = "cli")]
|
||||
pub mod knowledge;
|
||||
pub mod check;
|
||||
pub mod contract;
|
||||
|
||||
Reference in new issue
Block a user