Merge SolidCraft 0.40.0-rc.2 and retain the VibeMake platform integration
CI / Select checks (push) Has been cancelled
CI / Format and repository checks (push) Has been cancelled
CI / Compile RISC-V (manual) (push) Has been cancelled
Docker / image (push) Has been cancelled
Generated files / Regenerate and commit (push) Has been cancelled
Kernel rig / Select the rig areas (push) Has been cancelled
Lists / Design format changes merge cleanly (push) Has been cancelled
Lists / Lists are sorted one item per line (push) Has been cancelled
Packaging lint / lint (push) Has been cancelled
Pages / build (push) Has been cancelled
CI / Dependency advisories (push) Has been cancelled
CI / Quick compile (push) Has been cancelled
CI / Native Linux Clippy (push) Has been cancelled
CI / Build tests (push) Has been cancelled
CI / Native Linux tests (push) Has been cancelled
CI / GPU path tests (1/4) (push) Has been cancelled
CI / GPU path tests (2/4) (push) Has been cancelled
CI / GPU path tests (3/4) (push) Has been cancelled
CI / GPU path tests (4/4) (push) Has been cancelled
CI / Action matrix (1/16) (push) Has been cancelled
CI / Action matrix (10/16) (push) Has been cancelled
CI / Action matrix (11/16) (push) Has been cancelled
CI / Action matrix (12/16) (push) Has been cancelled
CI / Action matrix (13/16) (push) Has been cancelled
CI / Action matrix (14/16) (push) Has been cancelled
CI / Action matrix (15/16) (push) Has been cancelled
CI / Action matrix (16/16) (push) Has been cancelled
CI / Action matrix (2/16) (push) Has been cancelled
CI / Action matrix (3/16) (push) Has been cancelled
CI / Action matrix (4/16) (push) Has been cancelled
CI / Action matrix (5/16) (push) Has been cancelled
CI / Action matrix (6/16) (push) Has been cancelled
CI / Action matrix (7/16) (push) Has been cancelled
CI / Action matrix (8/16) (push) Has been cancelled
CI / Action matrix (9/16) (push) Has been cancelled
CI / Action matrix determinism (push) Has been cancelled
CI / Property tests (many cases) (push) Has been cancelled
CI / Doc tests (push) Has been cancelled
CI / Reference tests (push) Has been cancelled
CI / Windows D3D12 FXC shaders (push) Has been cancelled
CI / Windows app startup (push) Has been cancelled
CI / ci (push) Has been cancelled
CI / Compile WebAssembly (push) Has been cancelled
CI / Nightly alert (push) Has been cancelled
Kernel rig / Build the CLI (push) Has been cancelled
Kernel rig / Kernel rig (${{ matrix.shard }}) (push) Has been cancelled
Kernel rig / kernel-rig (push) Has been cancelled
Pages / deploy (push) Has been cancelled

Synchronize the ZIP-derived project with upstream commit
16f3b939b3, including the egui/eframe 0.37
upgrade. This adds 340 upstream commits after the recovered 0.30.1 baseline
147b4049cf.

Preserve managed-project login, persistence, assistant tools, Chinese input,
snapshot acknowledgements, and fixed-camera project covers. Adapt the
integration to the new UI APIs and complete required downstream translations.
Document the origin/upstream update workflow and retain the pre-update backup.

Validation on tree da03901ca8:
- Repository gates and strict workspace Clippy passed.
- The wasm target check and documentation tests passed.
- Fresh focused UI tests passed 154/154; engine preservation tests passed 7/7.
- Release web build passed; all 9 manifest files match sizes and SHA-256.
- Isolated browser smoke passed 35/35, using a mock API; offline web gate passed.
- Full UI unit binary: 4627 passed, 1 failed, 20 ignored.
- Full cargo xtask ci did not complete or pass: 79 test binaries passed and 8
  failed. Kernel and engine unit binaries remained unfinished when the run
  was stopped with SIGINT after 24m53s.

Observed failures include known geometry cases, an additional generated
boolean case, a cylinder-section case, and an Apple Metal thin-lens tolerance
failure. Kernel and document dependency comparisons match upstream, but no
independent clean-upstream runtime run was performed. The unfinished engine
suite and the GPU failure remain validation limitations. This source merge
does not establish a passing full release gate and does not deploy a service.
This commit is contained in:
2026-11-05 20:41:11 +08:00
1680 changed files with 115335 additions and 39072 deletions
+27 -6
View File
@@ -1,16 +1,20 @@
#!/usr/bin/env python3
"""Select the kernel rig areas a pull request affects (.github/workflows/kernel-rig.yml).
Usage: kernel_rig_plan.py (--all | --paths FILE) [--root DIR] [--github-output FILE]
Usage: kernel_rig_plan.py (--all | --paths FILE [--pin-diff DIFF]) [--root DIR] [--github-output FILE]
FILE holds the changed paths relative to the repository root, separated by NUL (git diff -z);
"-" reads standard input. --all selects every area (pushes, merge groups, the release gate, a run
"-" reads standard input. DIFF is the pull request's unified diff of the root Cargo.toml and
Cargo.lock (PIN_FILES). --all selects every area (pushes, merge groups, the release gate, a run
by hand). --root is the repository (default: two folders up from this script).
The areas are the folders of tests/kernel-cases/ (the ladder aside), so a new area joins by
having a folder with its cases, its KNOWN_FAILING and its PATHS. A changed path selects:
- every area, when it matches tests/kernel-cases/PATHS-ALL (the shared core: SMLib, geom, the
kernel's core, the rig's grader and runner, the workflow);
- every area, when the solidcore pin moves: a changed line of DIFF names solidcore's repository
(the root Cargo.toml's git rev, Cargo.lock's source). Another dependency's change in those
files runs none, so a pin is told apart by its lines, which a path filter cannot see;
- an area, when it is under tests/kernel-cases/<area>/ or matches that area's PATHS: one git
pathspec glob a line (`*` within a folder, `**` across folders), `#` starts a comment.
The ladder spans every operation: it runs whenever any area does, and on a change under
@@ -41,6 +45,18 @@ COVERAGE = (
"xtask/src/kernel_cases.rs",
)
# The files that pin solidcore, and the repository a pin's lines name.
PIN_FILES = ("Cargo.toml", "Cargo.lock")
SOLIDCORE = "github.com/tangency-labs/solidcore"
def pin_moved(diff):
"""Whether a unified diff of PIN_FILES changes a line that names solidcore's repository (an
added or removed line, not its file headers or context)."""
return any(
line.startswith(("+", "-")) and not line.startswith(("+++ ", "--- ")) and SOLIDCORE in line for line in diff.splitlines()
)
def glob_regex(glob):
"""A git pathspec glob (`:(glob)` magic) as a regular expression over a whole path: `**/`
@@ -95,11 +111,11 @@ def matches(globs, path):
return any(glob_regex(g).match(path) for g in globs)
def select(root, paths, everything=False):
def select(root, paths, everything=False, pin_diff=""):
"""Return (shards, build): the areas to run, in order and the ladder last, and whether the
build job runs."""
build job runs. `pin_diff` is the diff of PIN_FILES."""
by_area = areas(root)
if everything:
if everything or pin_moved(pin_diff):
return [*by_area, LADDER], True
shared = read_globs(os.path.join(root, CASES, "PATHS-ALL"))
hit, ladder = set(), False
@@ -127,10 +143,15 @@ def main():
group = ap.add_mutually_exclusive_group(required=True)
group.add_argument("--paths")
group.add_argument("--all", action="store_true")
ap.add_argument("--pin-diff")
ap.add_argument("--root", default=os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
ap.add_argument("--github-output")
a = ap.parse_args()
shards, build = select(a.root, [] if a.all else read_paths(a.paths), everything=a.all)
pin_diff = ""
if a.pin_diff:
with open(a.pin_diff, encoding="utf-8", errors="replace") as f:
pin_diff = f.read()
shards, build = select(a.root, [] if a.all else read_paths(a.paths), everything=a.all, pin_diff=pin_diff)
lines = [f"shards={json.dumps(shards)}", f"build={'true' if build else 'false'}"]
print("\n".join(lines))
if a.github_output:
+22
View File
@@ -74,6 +74,22 @@ class Synthetic(unittest.TestCase):
self.assertEqual(self.select("crates/engine/src/cmd/view_navigation.rs"), ([], True))
self.assertEqual(self.select("tests/kernel-cases/EXEMPT"), ([], True))
def test_a_solidcore_pin_change_runs_every_area(self):
moved = (
"--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -1,3 +1,3 @@\n name = \"solidcore\"\n"
'-source = "git+https://github.com/tangency-labs/solidcore?rev=97ed188#97ed188"\n'
'+source = "git+https://github.com/tangency-labs/solidcore?rev=8ddce90#8ddce90"\n'
)
everything = (["fillets", "shell", "ladder"], True)
self.assertEqual(plan.select(self.root, ["Cargo.lock", "Cargo.toml"], pin_diff=moved), everything)
def test_another_dependency_change_runs_nothing(self):
bumped = '--- a/Cargo.lock\n+++ b/Cargo.lock\n@@ -1,2 +1,2 @@\n name = "serde"\n-version = "1.0.1"\n+version = "1.0.2"\n'
self.assertEqual(plan.select(self.root, ["Cargo.lock", "Cargo.toml"], pin_diff=bumped), ([], False))
# A context line that names solidcore is no change to its pin.
context = '--- a/Cargo.toml\n+++ b/Cargo.toml\n@@ -1,2 +1,2 @@\n solidcore = { git = "https://github.com/tangency-labs/solidcore" }\n-a = 1\n+a = 2\n'
self.assertEqual(plan.select(self.root, ["Cargo.toml"], pin_diff=context), ([], False))
def test_everything_runs_every_area(self):
self.assertEqual(plan.select(self.root, [], everything=True), (["fillets", "shell", "ladder"], True))
@@ -148,6 +164,12 @@ class Real(unittest.TestCase):
with self.subTest(glob=g):
self.assertTrue(any(t.match(sample(g)) for t in triggers), f"{g}: not under the workflow's trigger paths")
def test_the_workflow_triggers_on_the_pin_files(self):
triggers = [plan.glob_regex(g) for g in trigger_globs()["pull_request"]]
for f in plan.PIN_FILES:
with self.subTest(file=f):
self.assertTrue(any(t.match(f) for t in triggers), f"{f}: not under the workflow's trigger paths")
def test_a_ui_change_runs_nothing(self):
self.assertEqual(plan.select(ROOT, ["crates/ui-egui/src/app.rs", "docs/kernel-cases.md", "README.md"]), ([], False))
-95
View File
@@ -1,95 +0,0 @@
#!/usr/bin/env bash
# Fetches SMLib for solidcraft-smlib (feature `native`), at the commit in crates/smlib/SMLIB_REV.
#
# scripts/fetch-smlib.sh [TARGET...] the prebuilt C API library for each Rust target (default:
# the host's), checked against crates/smlib/SMLIB_PREBUILT,
# into target/smlib-<rev12>-prebuilt/<target>; the sources
# for a target with no prebuilt library
# scripts/fetch-smlib.sh --source the sources (source/SMLib, source/SM_API, capi), into
# target/smlib-<rev12> or SOLIDCRAFT_SMLIB_DIR, to compile
# scripts/fetch-smlib.sh --pin writes SMLIB_PREBUILT from the release of SMLIB_REV
#
# The libraries are the release prebuilt-<rev> of tangency-labs/smlib (its prebuilt.yml).
# OpenCASCADE is not part of the fork.
set -euo pipefail
root="$(cd "$(dirname "$0")/.." && pwd)"
rev="$(tr -d '[:space:]' < "$root/crates/smlib/SMLIB_REV")"
pins="$root/crates/smlib/SMLIB_PREBUILT"
release="https://github.com/tangency-labs/smlib/releases/download/prebuilt-$rev"
sha256() {
if command -v sha256sum >/dev/null; then sha256sum "$1" | cut -d' ' -f1; else shasum -a 256 "$1" | cut -d' ' -f1; fi
}
fetch_source() {
local dest="${SOLIDCRAFT_SMLIB_DIR:-$root/target/smlib-${rev:0:12}}"
if [ -f "$dest/capi/include/smlib.h" ] && [ "$(git -C "$dest" rev-parse HEAD 2>/dev/null)" = "$rev" ]; then
echo "SMLib sources $rev already at $dest"
return
fi
rm -rf "$dest"
mkdir -p "$dest"
git -C "$dest" init -q
git -C "$dest" remote add origin https://github.com/tangency-labs/smlib.git
git -C "$dest" sparse-checkout set --no-cone /source/SMLib/ /source/SM_API/ /capi/ /LICENSE
git -C "$dest" fetch -q --depth 1 --filter=blob:none origin "$rev"
git -C "$dest" checkout -q FETCH_HEAD
echo "SMLib sources $rev at $dest"
}
fetch_prebuilt() {
local target="$1" want dest tmp
want="$(awk -v t="$target" '$1 == t { print $2 }' "$pins")"
if [ -z "$want" ]; then
echo "no prebuilt SMLib for $target: fetching the sources to compile"
fetch_source
return
fi
dest="$root/target/smlib-${rev:0:12}-prebuilt/$target"
if [ "$(cat "$dest/.sha256" 2>/dev/null)" = "$want" ]; then
echo "SMLib $rev for $target already at $dest"
return
fi
tmp="$(mktemp -d)"
trap 'rm -rf "$tmp"' RETURN
curl -fsSL --retry 3 -o "$tmp/smlib.tar.gz" "$release/smlib-$target.tar.gz"
if [ "$(sha256 "$tmp/smlib.tar.gz")" != "$want" ]; then
echo "smlib-$target.tar.gz does not match its SHA-256 in crates/smlib/SMLIB_PREBUILT" >&2
exit 1
fi
tar -xzf "$tmp/smlib.tar.gz" -C "$tmp"
if [ "$(tr -d '[:space:]' < "$tmp/smlib-$target/REV")" != "$rev" ]; then
echo "smlib-$target.tar.gz was built from another commit than SMLIB_REV" >&2
exit 1
fi
rm -rf "$dest"
mkdir -p "$(dirname "$dest")"
mv "$tmp/smlib-$target" "$dest"
echo "$want" > "$dest/.sha256"
echo "SMLib $rev for $target at $dest"
}
case "${1:-}" in
--source)
fetch_source
;;
--pin)
tmp="$(mktemp -d)"
trap 'rm -rf "$tmp"' EXIT
curl -fsSL --retry 3 -o "$tmp/SHA256SUMS" "$release/SHA256SUMS"
{
echo "# Rust target, SHA-256 of smlib-<target>.tar.gz in the release prebuilt-<SMLIB_REV> of"
echo "# tangency-labs/smlib. Written by scripts/fetch-smlib.sh --pin; never edited by hand."
sed -E 's/^([0-9a-f]{64}) +smlib-(.*)\.tar\.gz$/\2 \1/' "$tmp/SHA256SUMS" | sort
} > "$pins"
echo "pinned $(grep -vc '^#' "$pins") prebuilt targets of $rev"
;;
*)
if [ $# -eq 0 ]; then
set -- "$(rustc -vV | sed -n 's/^host: //p')"
fi
for target in "$@"; do
fetch_prebuilt "$target"
done
;;
esac