Skip to content

fix(ci): bump verify-flatpak's vendored Gradle dist to 9.7.1 to match the wrapper - #6782

Merged
jamesarich merged 1 commit into
mainfrom
fix/verify-flatpak-gradle-971
Aug 20, 2026
Merged

fix(ci): bump verify-flatpak's vendored Gradle dist to 9.7.1 to match the wrapper#6782
jamesarich merged 1 commit into
mainfrom
fix/verify-flatpak-gradle-971

Conversation

@jamesarich

@jamesarich jamesarich commented Aug 20, 2026

Copy link
Copy Markdown
Collaborator

Why

#6777 bumped gradle-wrapper.properties to Gradle 9.7.1, but scripts/verify-flatpak/desktop-offline.yaml vendors the distribution zip for the offline flatpak build and stayed at 9.6.1 — its own comment says "Update together." The wrapper now verifies the vendored zip against 9.7.1's checksum and fails: every PR since the bump fails both build-flatpak arches with Expected acd53f… / Actual 9c0f7f… (observed on #6779 and renovate/gradle-9.x).

🛠️ Change

One coupled pin: urlgradle-9.7.1-bin.zip, sha256acd53f1e… (the same value distributionSha256Sum on main verifies every wrapper download against).

Renovate has no manager for this yaml — follow-up candidate: a customManagers regex entry so the next wrapper bump updates both sides atomically.

Testing Performed

Pin now matches main's gradle-wrapper.properties exactly (version, -bin flavor, sha). Verification is this PR's own build-flatpak checks, which exercise the changed path directly — they fail on main's tip without this change.

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Chores
    • Updated the bundled Gradle version to 9.7.1.
    • Refreshed the associated integrity checksum.

… the wrapper

The offline flatpak build vendors the exact Gradle distribution named in
gradle-wrapper.properties, and the wrapper verifies it against
distributionSha256Sum. #6777 bumped the wrapper to 9.7.1 without the
coupled pin here, so every PR now fails both build-flatpak arches with a
checksum mismatch (expected 9.7.1's acd53f…, got the vendored 9.6.1's
9c0f7f…). Renovate manages the wrapper but has no manager for this yaml.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@github-actions github-actions Bot added the bugfix PR tag label Aug 20, 2026
@coderabbitai

coderabbitai Bot commented Aug 20, 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: 262d000c-b225-4108-b32e-bed1562d2e7e

📥 Commits

Reviewing files that changed from the base of the PR and between 4d9cf8e and 0885b86.

📒 Files selected for processing (1)
  • scripts/verify-flatpak/desktop-offline.yaml

Included review availability: Your plan provides up to 4 included reviews per hour; 0 remain after this review.


📝 Walkthrough

Walkthrough

The offline Flatpak configuration updates its bundled Gradle binary from version 9.6.1 to 9.7.1 and replaces the SHA-256 checksum.

Changes

Gradle bundle update

Layer / File(s) Summary
Update Gradle binary source
scripts/verify-flatpak/desktop-offline.yaml
The configuration downloads Gradle 9.7.1 and uses its corresponding SHA-256 checksum.

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

Merge Risk: ⚪ Minimal · up to 0885b

The vendored Gradle distribution and checksum are updated to match the wrapper, restoring the offline Flatpak verification path. No actionable merge-blocking risk remains after normal checks and review.

Suggested reviewers: simulationstation

🚥 Pre-merge checks | ✅ 8
✅ Passed checks (8 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 and the Gradle distribution update to version 9.7.1.
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 the Flatpak Gradle URL and SHA-256 in desktop-offline.yaml; it changes no nullable/default field, guard, presence check, or call site.
Tests Prove The Path, Not The End State ✅ Passed The diff changes only two Gradle URL/checksum lines in a Flatpak manifest; no test files or test assertions were added or changed, so this check is not applicable.
Regression Coverage For Changed Behavior ✅ Passed The diff only changes the vendored Gradle URL and SHA-256 pin; both match gradle-wrapper.properties. This is an exempt dependency version bump, with no new behavior requiring regression tests.
Moved Code Diffed Against Its Original ✅ Passed The exact diff changes only a Gradle URL and SHA-256 value in one YAML file; it moves no type or function and creates no moved-code call-site risk.

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 added this pull request to the merge queue Aug 20, 2026
@jamesarich
jamesarich removed this pull request from the merge queue due to a manual request Aug 20, 2026
@jamesarich
jamesarich merged commit afffc5c into main Aug 20, 2026
10 checks passed
@jamesarich
jamesarich deleted the fix/verify-flatpak-gradle-971 branch August 20, 2026 00:34
jamesarich added a commit that referenced this pull request Aug 20, 2026
…rapper

The offline flatpak manifest vendors the exact gradle-<version>-bin.zip
that gradle-wrapper.properties pins, verified by distributionSha256Sum.
When Renovate bumped the wrapper to 9.7.1 (#6777) without this file,
every PR touching the trigger paths failed both build-flatpak arches
15+ minutes in with "Verification of Gradle distribution failed!".

- Add a Renovate custom manager that mirrors wrapper bumps into the
  manifest's distribution URL in the same PR (shared depName "gradle").
  The sha256 cannot be auto-updated: the gradle-version datasource has
  no digest support and the hosted app disallows postUpgradeTasks.
- Extend the 9.7.0 block rule to match by depName so the custom manager
  can never propose the blocked version on its own.
- Add a guard step at the top of generate-sources that diffs the
  manifest's dist filename and sha256 against the wrapper and fails in
  seconds with a message naming both files, instead of silently letting
  the drift through to the flatpak build.
- Bump the vendored dist to 9.7.1 (same content as #6782) so the guard
  passes regardless of merge order.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
jamesarich added a commit that referenced this pull request Aug 20, 2026
…rapper

The offline flatpak manifest vendors the exact gradle-<version>-bin.zip
that gradle-wrapper.properties pins, verified by distributionSha256Sum.
When Renovate bumped the wrapper to 9.7.1 (#6777) without this file,
every PR touching the trigger paths failed both build-flatpak arches
15+ minutes in with "Verification of Gradle distribution failed!"
(hand-fixed by #6782).

- Add a Renovate custom manager that mirrors wrapper bumps into the
  manifest's distribution URL in the same PR (shared depName "gradle").
  The sha256 cannot be auto-updated: the gradle-version datasource has
  no digest support and the hosted app disallows postUpgradeTasks.
- Extend the 9.7.0 block rule to match by depName so the custom manager
  can never propose the blocked version on its own.
- Add a guard step at the top of generate-sources that diffs the
  manifest's dist filename and sha256 against the wrapper and fails in
  seconds with a message naming both files, instead of silently letting
  the drift through to the flatpak build.
- Update the manifest's pin comment to document the new coupling.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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