fix(nix): stage nix/lib.nix instead of removed per-package hash files - #39459
Closed
liuhao1024 wants to merge 2 commits into
Closed
fix(nix): stage nix/lib.nix instead of removed per-package hash files#39459liuhao1024 wants to merge 2 commits into
liuhao1024 wants to merge 2 commits into
Conversation
The nix-lockfile-fix.yml workflow still references nix/tui.nix and nix/web.nix, but commit a51a7b9 consolidated the npmDepsHash into nix/lib.nix. This means: - The file-whitelist guard flags nix/lib.nix as unexpected and aborts - git add stages nothing (tui.nix and web.nix are unchanged) - The auto-fix and PR-fix jobs can never commit their hash update Update both jobs to stage nix/lib.nix and adjust the guard regex to allow only nix/lib.nix through. Fixes NousResearch#39455
Contributor
|
Thanks for the focused fix. This is an automated hermes-sweeper review.
|
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.
What does this PR do?
Updates the
nix-lockfile-fix.ymlworkflow to stagenix/lib.nixinstead of the removed per-package hash files (nix/tui.nix,nix/web.nix). After the workspace lockfile consolidation ina51a7b9, the workflow can never commit its computed hash update.Related Issue
Fixes #39455
Type of Change
Changes Made
.github/workflows/nix-lockfile-fix.yml: Update the file-whitelist guard regex from^nix/(tui|web)\.nix$to^nix/lib\.nix$, and changegit addin both theauto-fix-mainandfixjobs fromnix/tui.nix nix/web.nixtonix/lib.nix.How to Test
fix-lockfileswrites tonix/lib.nix(notnix/tui.nixornix/web.nix):nix run .#fix-lockfiles -- --applyand checkgit diff --name-only.echo "nix/lib.nix" | grep -E '^nix/lib\.nix$'should match.nix/lib.nix.Checklist
Code
fix(scope):,feat(scope):, etc.)pytest tests/ -qand all tests passDocumentation & Housekeeping
docs/, docstrings) — or N/Acli-config.yaml.exampleif I added/changed config keys — or N/ACONTRIBUTING.mdorAGENTS.mdif I changed architecture or workflows — or N/ACode Intelligence
.github/workflows/nix-lockfile-fix.yml,nix/lib.nix,nix/tui.nix,nix/web.nixa51a7b9(consolidation commit),ba57ebec3(hash bump)