scrub: skip flake checks for conflicted commits#21
Merged
Conversation
Conflicted commits show "skipped: conflict" instead of building. Commits with jj conflict trees or git conflict markers will always fail nix flake check. The conflict check already runs first — now build a skip map from its results and filter conflicted commits out of flake check phases (sequential, parallel, and quick pre-check).
bc1cindy
approved these changes
May 26, 2026
bc1cindy
left a comment
bc1cindy
left a comment
There was a problem hiding this comment.
makes sense, utACK
conflicts still fail via conflict_failed, so skip is safe
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
3 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.
Conflicted commits show "skipped: conflict" instead of building.
Commits with jj conflict trees or git conflict markers will always fail nix flake check. The conflict check already runs first — now build a skip map from its results and filter conflicted commits out of flake check phases (sequential, parallel, and quick pre-check).