fix(ci): unbreak the merge queue on Gradle 9.6.1 - #6636
Merged
Conversation
The verification scripts still passed --no-isolated-projects, which only exists on Gradle 9.7+. rb-check runs solely in the merge queue, so every PR went green and then failed on entry, dropping out with auto-merge disabled. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (3)
📝 WalkthroughWalkthroughGradle verification commands now disable isolated projects with ChangesGradle flag migration
Estimated code review effort: 1 (Trivial) | ~5 minutes Suggested labels: Suggested reviewers: 🚥 Pre-merge checks | ✅ 6✅ Passed checks (6 passed)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
Why
The merge queue is currently broken for every PR in the repo. Merge-group runs fail with:
--no-isolated-projectsonly exists on Gradle 9.7+. When #6611 pinned the wrapper back to 9.6.1 (to unbreak CMP desktop ProGuard), #6613 swept that flag out of.github/workflows/**but missed the two verification scripts, which still pass it.This hid because of how
rb-checkis gated —if: … github.event_name == 'merge_group'(reusable-check.yml:159). It never runs on pull requests, so PRs go green, enter the queue, and die there. Observed fallout: #6623 and #6625 were both silently dropped from the queue with auto-merge disabled, and #6614/#6628 cycled for over an hour.scripts/verify-flatpak/verify.shcarries the same flag. It isn't part of the queue failure (the CI flatpak job invokes Gradle directly and was already fixed by #6613), but it's the local developer entry point and is equally broken on 9.6.1 — fixing both keeps the sweep complete.🐛 Bug fixes
scripts/verify-rb.sh— replace--no-isolated-projectswith the version-portable-Dorg.gradle.isolated-projects=falsein all three Gradle invocations (steps 1 and 2).scripts/verify-flatpak/verify.sh— same swap for the sources-regeneration invocation.settings.gradle.kts— update the flatpak-sources gate comment, which still told readers that callers pass the removed flag.This is the same substitution #6613 applied to the workflows, so the repo is now consistent:
-Dorg.gradle.isolated-projects=falseeverywhere, and no reference to the 9.7-only flag outside the explanatory comment atreusable-check.yml:457.Testing Performed
android-check / rb-checkon the flag parse, 35s in, before any real work.--no-isolated-projectsusages outside the comment that documents why it must not be used.rb-checkitself only runs in the merge queue, so this PR's own green checks do not exercise the fix — the queue run on merge is the real verification.🤖 Generated with Claude Code
Summary by CodeRabbit
Bug Fixes
Documentation