Files
likang 7247ba6b03
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
Merge SolidCraft 0.40.0-rc.2 and retain the VibeMake platform integration
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.
2026-11-05 20:41:11 +08:00

2.7 KiB

Updating this downstream repository

The origin remote is the Gitea repository likang/makeCAD. The upstream remote is tangency-labs/solidcraft on GitHub. Push project changes to origin. The local upstream push URL is disabled to prevent accidental publication there.

The initial ZIP snapshot was matched to upstream commit 147b4049cf6db6e23c687f4550ebbe4272880437 (November 3, 2026). Commit ec622d10880bc2077c2ea1ed9c436c825eeefb0e records the local platform integration before the first update. The branch backup/local-before-upstream-20261105 retains that checkpoint.

The first synchronization targets upstream commit 16f3b939b354f6ebe27faa5ae566ccb90292f939 (November 5, 2026), including the egui/eframe 0.37 upgrade. The upstream workspace version is 0.40.0-rc.2. Later upstream commits belong to the next synchronization.

Future updates

First inspect git status and commit the local work that must be retained. Review the staged files and run cargo xtask ci before each commit. Do not switch branches or edit the source while that check is running.

With a clean working tree on main, run these commands one at a time:

git fetch origin
git merge --ff-only origin/main
git branch backup/before-upstream-YYYYMMDD-HHMM
git fetch upstream
git merge --no-commit --no-ff upstream/main

Replace the backup branch suffix with the actual update date and time. If the fast-forward from Gitea fails, inspect the divergent commits before proceeding.

Review the upstream changes and resolve any conflicts by preserving the intended local behavior alongside the upstream changes. Stage the resolved files with git add. Do not blindly select one entire side of a conflicted file.

Before completing the merge, verify the staged changes and run the gate:

git diff --cached --stat
git diff --cached upstream/main --check
cargo xtask ci
git commit
git push origin main

If validation fails, investigate the failure before treating the update as ready. To abandon an unfinished merge, use git merge --abort. The backup branch retains the committed state from before the update. Avoid git reset --hard and force pushes when synchronizing this repository.

Local artifacts

Build outputs in target*/ and dist/, and generated review media under docs/vibemake/evidence, are excluded from source control. Keep any required artifact backups separately. The source archive made before the first update is stored in the sibling solidcraft-migration-20261105-181759 directory.

After a source update, rebuild the web engine with node scripts/build-vibemake-cad.mjs before deploying its new assets. A Git push does not rebuild or deploy an existing running web service.