fix(nix): stage consolidated lockfile hash - #39814
Closed
yinkev wants to merge 1 commit into
Closed
Conversation
alt-glitch
added
type/bug
Contributor
Author
|
Closing this to reduce duplicate review load after maintainer triage labeled it duplicate. If maintainers prefer this exact branch for #39455, I can reopen or rebase it. |
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
2 participants
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
nix/lib.nixnix/lib.nixin both the main auto-fix and manual PR fix jobsContext
Fixes #39455.
fix-lockfilesnow writes the consolidated npm hash innix/lib.nix, butnix-lockfile-fix.ymlstill whitelisted and staged the old per-package files (nix/tui.nix,nix/web.nix). That made the auto-fix path reject the actual hash update as unexpected or commit nothing.Verification
rg -n "nix/tui\.nix|nix/web\.nix|grep -Ev|git add nix/" .github/workflows/nix-lockfile-fix.ymlruby -e 'require "yaml"; YAML.load_file(".github/workflows/nix-lockfile-fix.yml"); puts "yaml ok"'git diff --checkactionlintandyamllintare not installed in this environment, so I could not run those local validators.