Skip to content

.gitattributes: mark package-lock.json as binary#21945

Merged
AnnsAnns merged 1 commit intoRIOT-OS:masterfrom
LasseRosenow:mark-package-lock-json-as-binary
Dec 9, 2025
Merged

.gitattributes: mark package-lock.json as binary#21945
AnnsAnns merged 1 commit intoRIOT-OS:masterfrom
LasseRosenow:mark-package-lock-json-as-binary

Conversation

@LasseRosenow
Copy link
Copy Markdown
Member

@LasseRosenow LasseRosenow commented Dec 9, 2025

Contribution description

Starlight uses Node.js and NPM (Node Package Manager) similar to Cargo in Rust it creates a package-lock.json, which is generated when updating versions of packages.
I think it is reasonable to treat this as binary similar to how we also treat Cargo.lock as binary.

EDIT: Blocks #21944

*.md conflict-marker-size=100
*.txt conflict-marker-size=100
*.svg binary
package-lock.json binary
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I read through a few sites and am still a bit unsure, does this even apply retroactively to a file already in the git history?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From how I understand it, it should be treated as binary from the next time on, that it is being updated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So would merging this before #21944 make sense?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

@AnnsAnns AnnsAnns added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs labels Dec 9, 2025
Copy link
Copy Markdown
Member

@AnnsAnns AnnsAnns left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Talked with maintainers, this should work locally, does not work for Github, which is arguably still an improvement. Ty.

@AnnsAnns AnnsAnns enabled auto-merge December 9, 2025 15:02
@riot-ci
Copy link
Copy Markdown

riot-ci commented Dec 9, 2025

Murdock results

✔️ PASSED

d82aaae .gitattributes: mark package-lock.json as binary

Success Failures Total Runtime
1 0 1 01m:17s

Artifacts

@AnnsAnns AnnsAnns added this pull request to the merge queue Dec 9, 2025
@crasbe crasbe added the Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation label Dec 9, 2025
Merged via the queue into RIOT-OS:master with commit 876aaa3 Dec 9, 2025
33 checks passed
@LasseRosenow LasseRosenow deleted the mark-package-lock-json-as-binary branch December 11, 2025 09:15
@leandrolanzieri leandrolanzieri added this to the Release 2026.01 milestone Jan 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: skip compile test If set, CI server will run only non-compile jobs, but no compile jobs or their dependent jobs Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants