Repository navigation
Fix Debian normalization test on macOS - #1439
Merged
Merged
Conversation
The test added in #1426 runs normalize_deb_package with the shell's ar. On Darwin that is llvm-ar, whose default BSD format pads members. The padding survives extraction, and GNU tar treats gzip's trailing garbage warning as fatal, so any Mac commit running the repo hook component stopped here. Have this test write GNU archives, which is what a Debian package is, when ar is llvm-ar. Packaging scripts and GNU ar runs are unchanged. Fixes #1438 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Fixes #1438.
Problem
test_deb_normalization_refreshes_checksums_and_verifier_rejects_tampering, added in #1426, fails on macOS.arin the.#cishell isllvm-ar, whose default BSD format pads members with bytes that survivear x. GNU tar then treats gzip's trailing garbage warning as fatal, so a Mac commit running therepohook component stops here unless it is excluded withMAPLE_HOOK_ONLY.The failure is not from the nixpkgs bump in #1431: it reproduces just before it at
39117268(LLVM 21.1.7, gzip 1.14). Thear xandtar -xzfsteps long predate #1426, which is only the first thing to run them on a Mac. Debian packages are built on Linux, so shipped packages are not affected.Change
When
arreports LLVM, this one test puts a wrapper on its temporaryPATHthat adds--format=gnu. A Debian package is a GNU archive, and in this format members round-trip byte-identically. It is test-only: no changes to_common.sh, the flake or the Linux path, and no new dependency. GNU binutils onPATHwas avoided because a GNUarin the shell could affect Mac native builds.Validation
On aarch64-darwin:
just lane repopasses.repopre-commit component passes in a real commit, withoutMAPLE_HOOK_ONLY(542 tests, 2 skipped).arfirst onPATH, where the wrapper stays off.normalize_deb_packagestops refreshingmd5sums, and when the verifier's md5 check is removed. These ran in a throwaway partial copy; the target test passes there unmutated.Not run locally: Linux. The hosted
repolane covers it.🤖 Generated with Claude Code
Open in [code]smith · Need help on this PR? Tag
@codesmith-botwith what you need.