Skip to content

QVAC-22630 chore[skiplog]: backmerge release model-fit 0.6.0 — changelog - #4016

Merged
simon-iribarren merged 3 commits into
mainfrom
backmerge/release-model-fit-0.6.0
Aug 24, 2026
Merged

QVAC-22630 chore[skiplog]: backmerge release model-fit 0.6.0 — changelog#4016
simon-iribarren merged 3 commits into
mainfrom
backmerge/release-model-fit-0.6.0

Conversation

@simon-iribarren

@simon-iribarren simon-iribarren commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

🎯 What problem does this PR solve?

Release PR #4008 merged into release-model-fit-0.6.0, so @qvac/model-fit@0.6.0
— process protocol v2 and the completion/embedding load normalization from
#3930 — is now a cut release. But
main's changelog has no record of it: its history jumps 0.5.00.7.0.

Downstream, packages/sdk on #4010 declares @qvac/model-fit: ^0.6.0 and needs
that release to exist and be documented.

📝 How does it solve it?

Changelog-only. packages/model-fit/CHANGELOG.md gains the 0.6.0 section,
copied verbatim from the release branch and inserted beneath 0.7.0, so the
history reads 0.7.0, 0.6.0, 0.5.0.

packages/model-fit/package.json is deliberately not touched. This is the
hand-crafted-backmerge case the workflow warns about — main moved ahead of the
release between cut and publish:

So main is at 0.7.0, which is ahead of the version being released, and the
same number 0.6.0 briefly meant two different things. Writing 0.6.0 back
into main's package.json would regress it and re-collide with the fabric
release. A literal git merge of the release branch would have done exactly
that.

Note that the released 0.6.0 does not contain the b10297 fabric sync — the
release branch predates #3883 — while main's 0.7.0 does. That is expected
for a branch cut at 975b36ea3 and is why the two entries are separate.

Tagged [skiplog]: the changelog was already written on the release branch.

🧪 How was it tested?

The 0.6.0 section is byte-identical to the release branch's, checked
programmatically rather than by eye (85 lines, verbatim match against
release-model-fit-0.6.0:packages/model-fit/CHANGELOG.md).

The resulting diff against main is exactly the 86 added changelog lines and
nothing else:

$ git diff --stat upstream/main
 packages/model-fit/CHANGELOG.md | 86 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

No source, dependency, or version change, so there is nothing for the package's
own suites to exercise; it inherits #4008's verification.

Precedent for the changelog-only shape: #3804, the 0.1.0 backmerge.

⚠️ Release status — 0.6.0 is not on npm yet

Independent of this PR, and worth flagging for whoever owns the release:

  • npm latest for @qvac/model-fit is still 0.5.0.
  • The publish run triggered by QVAC-22630 chore: release @qvac/model-fit 0.6.0 #4008 merging into release-model-fit-0.6.0
    (run 32743412492)
    failed, in build / prebuild / win32-x64 with exit code 127 — a runner
    environment failure in the Windows prebuild step, not a content failure.
  • publish-npm requires build.result == 'success', so it never ran.

The run needs re-triggering (or the Windows runner fixed) before 0.6.0 reaches
npm. This PR is correct either way — it only records the release in main's
changelog.

Companion PRs

Lands the release metadata for @qvac/model-fit@0.6.0 on main: the version bump
and the 0.6.0 changelog entry, copied from the release branch. No source change.

Tagged [skiplog] — the changelog was already written on the release branch.
@github-actions

Copy link
Copy Markdown
Contributor

License compliance — clean

No new dependency license findings in this PR.

Warn-only (shadow) mode — this check does not block merges yet.

Updated automatically by the canonical license compliance workflow.

NOTICE presence (advisory)

Missing NOTICE (advisory, does not block):

  • ./.github/actions/release-merge-guard
  • ./docs/website
  • ./packages/ggml-coload-smoke
  • ./packages/fabric/test/integration
  • ./packages/inference-addon-cpp/mobile
  • ./packages/sdk/e2e
  • ./packages/llm-llamacpp/benchmarks/performance
  • ./packages/llm-llamacpp/benchmarks/server
  • ./packages/vla-ggml/sim/server
  • ./packages/embed-llamacpp/benchmarks/performance
  • ./packages/embed-llamacpp/benchmarks/server
  • ./packages/asr-ggml/benchmarks/server

@simon-iribarren
simon-iribarren marked this pull request as ready for review August 24, 2026 10:59
@simon-iribarren
simon-iribarren requested review from a team as code owners August 24, 2026 10:59
@github-actions

github-actions Bot commented Aug 24, 2026

Copy link
Copy Markdown
Contributor

Review Status

Current Status: ✅ APPROVED
Approvals so far: Team Lead: 1, Member: 1

opaninakuffo
opaninakuffo previously approved these changes Aug 24, 2026
Victor-Rodzko
Victor-Rodzko previously approved these changes Aug 24, 2026
Resolves the conflict main created after this branch was cut, and reduces the
backmerge to changelog-only.

- packages/model-fit/package.json: keep main's 0.7.0. #3883 bumped main to
  0.6.0 for the fabric b10297 sync and #4028 renamed that to 0.7.0 precisely
  because #4008 was claiming 0.6.0 for protocol v2. Main is therefore ahead of
  the version being released, and a backmerge must not regress it.
- packages/model-fit/CHANGELOG.md: keep main's 0.7.0 section at the top and
  insert the released 0.6.0 section verbatim beneath it, so the history reads
  0.7.0, 0.6.0, 0.5.0 and main records the protocol-v2 release it was missing.
@simon-iribarren simon-iribarren changed the title QVAC-22630 chore[skiplog]: backmerge release model-fit 0.6.0 — version bump, changelog QVAC-22630 chore[skiplog]: backmerge release model-fit 0.6.0 — changelog Aug 24, 2026
@simon-iribarren
simon-iribarren merged commit fea4064 into main Aug 24, 2026
43 checks passed
@simon-iribarren
simon-iribarren deleted the backmerge/release-model-fit-0.6.0 branch August 24, 2026 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants