Skip to content

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
ranxianglei:masterfrom
YunzhouLi-hub:2026-10-10_bundle-patch-eol-lf
Closed

YunzhouLi-hub wants to merge 2 commits into
ranxianglei:masterfrom
YunzhouLi-hub:2026-10-10_bundle-patch-eol-lf

Conversation

@YunzhouLi-hub

Copy link
Copy Markdown
Contributor

Follow-up to #2605 / #2610 — master is red on both Windows test combos.

Failure (evidence)

Root cause (reproduced locally with core.autocrlf=true, same as the runners)

dsh.bundle.patch.yml had no eol attribute → Git-for-Windows checks it out with CRLF (32 CR bytes in a fresh working copy). The new test does byte-exact includes() against \n-joined rows (tests/issue2605-dsh-retry-patch.test.ts:26-29), so with CRLF every \n becomes \r\n and all three assertions fail. Ubuntu checkouts are LF, hence green. The sibling overlay test is unaffected because writeDshAcpPatch() generates its content with \n itself.

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:

dsh.bundle.patch.yml text eol=lf

Verification (local, core.autocrlf=true)

Once this lands, PR #2619's Windows combos should re-run green.

…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.
@YunzhouLi-hub

Copy link
Copy Markdown
Contributor Author

Closing — superseded by #2634 (7cf6796), which landed the same .gitattributes line plus a stronger test-side CRLF normalization before the byte-exact includes. Same diagnosis, better fix; nothing left for this branch to carry. Thanks!

@YunzhouLi-hub
YunzhouLi-hub deleted the 2026-10-10_bundle-patch-eol-lf branch October 10, 2026 08:47
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.

1 participant