Fix/cask on system conditionals infinite loop#21733
Merged
MikeMcQuaid merged 2 commits intoHomebrew:mainfrom Mar 14, 2026
Merged
Fix/cask on system conditionals infinite loop#21733MikeMcQuaid merged 2 commits intoHomebrew:mainfrom
MikeMcQuaid merged 2 commits intoHomebrew:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes an infinite autocorrect loop in the RuboCop::Cop::Cask::OnSystemConditionals cop when handling macOS version conditionals inside flight stanzas, and updates the spec to assert stable autocorrection without workarounds.
Changes:
- Passes
allowed_blocks: FLIGHT_STANZA_NAMEStoaudit_macos_version_conditionalsto prevent conflicting corrections within flight stanzas. - Removes
loop: falseand associated FIXME comments from the cop’s spec now that autocorrection converges.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| Library/Homebrew/rubocops/cask/on_system_conditionals.rb | Ensures macOS version conditional auditing respects flight-stanza exclusions to avoid flip-flop autocorrections. |
| Library/Homebrew/test/rubocops/cask/on_system_conditionals_spec.rb | Cleans up specs by removing infinite-loop workarounds and confirming stable corrections. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
You can also share your feedback on Copilot code review. Take the survey.
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.
brew lgtm(style, typechecking and tests) with your changes locally?Fix infinite autocorrect loop in
Cask::OnSystemConditionalscop.audit_macos_version_conditionalswas called withoutallowed_blocks, so whenaudit_on_system_blockscorrectedon_monterey do→if MacOS.version == :montereyinside flight stanzas (postflight, etc.), the next pass would reverse it back toon_monterey do, causing an infinite loop.The fix passes
allowed_blocks: FLIGHT_STANZA_NAMEStoaudit_macos_version_conditionals, matching the existing pattern used byaudit_arch_conditionals.Also removes the
loop: falseworkarounds and stale FIXME comments from tests.Fixes the 3 FIXME comments in
on_system_conditionals_spec.rb.