Skip to content

fix(ci): unbreak the merge queue on Gradle 9.6.1 - #6636

Merged
jamesarich merged 1 commit into
mainfrom
fix/verify-rb-isolated-projects-flag
Aug 12, 2026
Merged

fix(ci): unbreak the merge queue on Gradle 9.6.1#6636
jamesarich merged 1 commit into
mainfrom
fix/verify-rb-isolated-projects-flag

Conversation

@jamesarich

@jamesarich jamesarich commented Aug 12, 2026

Copy link
Copy Markdown
Collaborator

Why

The merge queue is currently broken for every PR in the repo. Merge-group runs fail with:

Problem configuring task :androidApp:exportLibraryDefinitions from command line.
> Unknown command-line option '--no-isolated-projects'.

--no-isolated-projects only 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-check is 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.sh carries 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-projects with the version-portable -Dorg.gradle.isolated-projects=false in 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=false everywhere, and no reference to the 9.7-only flag outside the explanatory comment at reusable-check.yml:457.

Testing Performed

  • Reproduced the failure: merge-group run 31550351253 fails in android-check / rb-check on the flag parse, 35s in, before any real work.
  • Verified the fix locally on the pinned 9.6.1 wrapper — the exact failing command now succeeds:
    ./gradlew :androidApp:exportLibraryDefinitions -Pci=true -Dorg.gradle.isolated-projects=false --no-configuration-cache
    → Task :androidApp:exportLibraryDefinitions UP-TO-DATE
    → BUILD SUCCESSFUL in 27s
    
  • Repo-wide sweep confirms no remaining --no-isolated-projects usages outside the comment that documents why it must not be used.
  • rb-check itself 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

    • Updated Flatpak and Ruby verification workflows to remain compatible with current Gradle versions.
    • Preserved existing configuration-cache and task rerun behavior.
  • Documentation

    • Updated related build configuration guidance to reflect the current Gradle option.

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>
@coderabbitai

coderabbitai Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: c8d3a165-54b1-4955-af30-737b29a57790

📥 Commits

Reviewing files that changed from the base of the PR and between 6c06601 and 8ceae68.

📒 Files selected for processing (3)
  • scripts/verify-flatpak/verify.sh
  • scripts/verify-rb.sh
  • settings.gradle.kts

📝 Walkthrough

Walkthrough

Gradle verification commands now disable isolated projects with -Dorg.gradle.isolated-projects=false. Existing tasks and build flags remain unchanged. The related settings comment now documents the updated property.

Changes

Gradle flag migration

Layer / File(s) Summary
Update verification commands
scripts/verify-flatpak/verify.sh, scripts/verify-rb.sh, settings.gradle.kts
Verification scripts use the system-property form instead of --no-isolated-projects. The settings comment documents the same form.

Estimated code review effort: 1 (Trivial) | ~5 minutes

Suggested labels: repo, bugfix

Suggested reviewers: vidplace7

🚥 Pre-merge checks | ✅ 6
✅ Passed checks (6 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the CI fix, the merge queue issue, and the affected Gradle version.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Sibling Call Sites And Presence Semantics ✅ Passed The diff only changes Gradle flags in two shell scripts and one comment; it does not alter nullable values, presence checks, sibling call sites, or metric field defaults.
Tests Prove The Path, Not The End State ✅ Passed The patch changes only two verification scripts and one Gradle comment; it adds or changes no tests, so the custom test-path failure conditions do not apply.

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@jamesarich
jamesarich merged commit 98e9320 into main Aug 12, 2026
6 checks passed
@jamesarich
jamesarich deleted the fix/verify-rb-isolated-projects-flag branch August 12, 2026 01:36
@github-actions github-actions Bot added the bugfix PR tag label Aug 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix PR tag

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant