Uh oh!
There was an error while loading. Please reload this page.
[build] Switch lz4 submodule to upstream lz4/lz4 - #11671
Closed
jonathanpeppers wants to merge 1 commit into
Closed
Conversation
The `external/lz4` submodule has been pointing at `dotnet/lz4` (a fork of `lz4/lz4`) for historical reasons, but the fork carries no downstream changes -- every commit "ahead" of upstream is just a no-op merge from the periodic mirror sync. Switch the submodule to track upstream `lz4/lz4` directly so we can pick up active maintenance and security fixes when we next bump the pin. Changes: * `.gitmodules`: `url = https://github.com/lz4/lz4`, `branch = dev`. * `external/lz4` gitlink: bumped from `ebb370ca83af193212df4dcbadcc5d87bc0de2f0` (a merge commit owned by the fork) to `68959d27c3ec37b339b3b8ecfea155faf0ef94f2`, which is the upstream `dev`-side parent of that merge. The two trees are byte-identical (same root tree SHA `1ff35e0f...`), so this is a no-op for the source content. * `.github/skills/update-tpn/SKILL.md`: drop the "(fork of ...)" note on the lz4 row -- it's no longer a fork. Verified `dotnet-local.cmd build src/native/native-mono.csproj -p:Configuration=Debug` produces 0 errors and the expected `libxa-lz4-release.a` for all four ABIs (`android-arm`, `android-arm64`, `android-x64`, `android-x86`). This supersedes dotnet#11658, which had vendored the lz4 sources into `src-ThirdParty/lz4/`; that approach was abandoned in favor of this simpler submodule URL switch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR repoints the external/lz4 submodule from the inactive dotnet/lz4 fork to the upstream lz4/lz4 repository, keeping the checked-in source content effectively the same while enabling future updates to track upstream maintenance/security fixes.
Changes:
- Update
.gitmodulesto usehttps://github.com/lz4/lz4and track thedevbranch for theexternal/lz4submodule. - Update the update-TPN skill inventory to reflect the new upstream URL for lz4.
- (As described) Move the
external/lz4gitlink to the upstream commit that matches the fork’s merge-parent content.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
.gitmodules | Switch external/lz4 submodule URL to upstream lz4/lz4 and set tracking branch to dev. |
.github/skills/update-tpn/SKILL.md | Update the documented submodule URL for lz4 to match the new upstream location. |
external/lz4 | Update the submodule gitlink to the corresponding upstream commit (content-equivalent to the previously pinned fork merge). |
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 freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Summary
The
external/lz4submodule has been pointing atdotnet/lz4(a fork oflz4/lz4) for historical reasons. The fork carries zero downstream changes -- every commit "ahead" of upstream is just a no-op merge from the periodic mirror sync. This PR switches the submodule to track upstreamlz4/lz4directly so we can pick up active maintenance and security fixes when we next bump the pin.Verification: the fork has no custom changes
Confirmed via:
→
ahead_by=5, behind_by=0, files-changed=0. The 5 "ahead" commits are all merge commits with no file changes; last sync was July 2024.Changes
.gitmodules:url = https://github.com/lz4/lz4,branch = dev.external/lz4gitlink: bumped fromebb370ca83af193212df4dcbadcc5d87bc0de2f0(a merge commit owned by the fork) to68959d27c3ec37b339b3b8ecfea155faf0ef94f2, which is the upstreamdev-side parent of that merge. The two trees are byte-identical (same root tree SHA1ff35e0f086e3b431ea0efd001eb5c6254561953), so this is a no-op for the source content..github/skills/update-tpn/SKILL.md: drop the "(fork of ...)" note on the lz4 row -- it's no longer a fork.THIRD-PARTY-NOTICES.TXTis left alone -- the existinglz4/lz4block is already correctly attributed to upstream.Build verification
Produces 0 errors (81 unrelated warnings) and the expected
libxa-lz4-release.aartifacts for all four ABIs:android-armandroid-arm64android-x64android-x86Related
Supersedes #11658, which had vendored the lz4 sources into
src-ThirdParty/lz4/; that approach was abandoned in favor of this simpler submodule URL switch.