Repository navigation
fix: force LF checkout for dsh.bundle.patch.yml (Windows CI red, follow-up to #2605/#2610) - #2624
Closed
YunzhouLi-hub wants to merge 2 commits into
Closed
YunzhouLi-hub wants to merge 2 commits into
YunzhouLi-hub wants to merge 2 commits into
Conversation
…low-up to ranxianglei#2605/ranxianglei#2610) tests/issue2605-dsh-retry-patch.test.ts does byte-exact includes() with \n-joined rows against the checked-in dsh.bundle.patch.yml. The file had no eol attribute, so Git-for-Windows (autocrlf=true, the CI windows runners) checks it out with CRLF and every assertion fails - only on Windows. Master 98fb91c is red on both windows combos exactly this way (run 38035441775 [sic 38034641775], "not ok 2359 - ranxianglei#2605: dsh.bundle patch yml restates every default code..."). Same class of bug and same fix the repo already shipped for the golden snapshots in ranxianglei#1305: one .gitattributes line.
Contributor
Author
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.
Follow-up to #2605 / #2610 — master is red on both Windows test combos.
Failure (evidence)
test (windows-latest, 22)andtest (windows-latest, 24)both fail with the identical line —not ok 2359 - #2605: dsh.bundle.patch.yml restates every default code + MALFORMED_RESPONSE on both DeepSeek routesRoot cause (reproduced locally with core.autocrlf=true, same as the runners)
dsh.bundle.patch.ymlhad no eol attribute → Git-for-Windows checks it out with CRLF (32 CR bytes in a fresh working copy). The new test does byte-exactincludes()against\n-joined rows (tests/issue2605-dsh-retry-patch.test.ts:26-29), so with CRLF every\nbecomes\r\nand all three assertions fail. Ubuntu checkouts are LF, hence green. The sibling overlay test is unaffected becausewriteDshAcpPatch()generates its content with\nitself.This is the exact bug class the repo already fixed for the golden snapshots in #1305 (see the .gitattributes comment: byte-exact gates + autocrlf → CRLF → Windows-only failures).
Fix
One line in .gitattributes, same treatment as #1305:
Verification (local, core.autocrlf=true)
tests/issue2605-dsh-retry-patch.test.ts2/2 pass.Once this lands, PR #2619's Windows combos should re-run green.