Repository navigation
Merge upstream v0.31.0 into main; re-gofmt splice_handler_test.go with the pinned toolchain - #2076
Merged
Merged
Conversation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011oK82qLAJChCDrvVEDoScz
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011oK82qLAJChCDrvVEDoScz
Brings in upstream's two commits the fork lacked: the v0.31.0 release changelog/blog and a gofmt of splice_handler_test.go. CHANGELOG resolved by hand. Git's merge placed the fork's 11 Unreleased entries (work that is not in the v0.31.0 tag) under the new [0.31.0] heading; they stay under [Unreleased]. Everything from [0.31.0] down is upstream's text verbatim. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AeAyg3qx2my26Q8cvGyW5z
Upstream's 1365ba4 reformatted it with a gofmt other than go1.27.3's, the toolchain go.mod pins and make fmt-check runs, so the merged tree failed fmt-check (mendixlabs#1793). This restores the fork's toolchain-formatted version; make fmt-check passes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AeAyg3qx2my26Q8cvGyW5z
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The upstream sync PR mendixlabs#1793 fails
make fmt-checkon its merge tree:mdl/backend/mfmutator/splice_handler_test.go is not gofmt-clean.Cause
Upstream's
1365ba438("style: gofmt splice_handler_test.go") reformatted that file with a gofmt other than go1.27.3's — the toolchaingo.modpins andmake fmt-checkruns ($(go env GOROOT)/bin/gofmt). Under that gofmt the fork's version is clean and upstream's is not. The fork had not touched the file since the merge base, so the merge took upstream's version and fmt-check fails. Upstream's ownmainfails the same check.Change
mendixlabs/mxcli:main(v0.31.0) into the fork, bringing in the two commits it lacked (the release changelog/blog and that gofmt).CHANGELOG.mdis resolved by hand: git's merge filed the fork's 11[Unreleased]entries — work that is not in the v0.31.0 tag — under the new[0.31.0]heading. They stay under[Unreleased]; everything from[0.31.0]down is upstream's text verbatim. Checked: no fork or upstream changelog line is lost or duplicated.Once this lands on
main, #1793 (headako:main) carries the fix and becomes a fast-forward of upstream plus the fork's work.Validation
make fmt-checkonrefs/pull/1793/mergefails on that file; on this branch it passes.make ci-localon this branch: every step passes. One package,mdl/backend/modelsdk, first failed locally only because thetestdata/testappsubmodule was not initialised in this container (CI's build-and-test checks it out); with it initialised the package passes.Generated by Claude Code