From ef9d2fe725aca37591ba04eda075212ebeee1423 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 24 Sep 2026 18:14:51 -0700
Subject: [PATCH] ci(flatpak): stop the Gradle daemon before reclaiming its
 home (#7347)

---
 .github/workflows/verify-flatpak.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/verify-flatpak.yml b/.github/workflows/verify-flatpak.yml
index 685ed57802..6854acda7a 100644
--- a/.github/workflows/verify-flatpak.yml
+++ b/.github/workflows/verify-flatpak.yml
@@ -122,8 +122,11 @@ jobs:
           echo "- URLs captured: $(jq length flatpak-sources.json)" >> "$GITHUB_STEP_SUMMARY"
 
       # flatpak-builder re-downloads the whole closure anyway; a second copy just eats disk.
+      # The daemon from the previous step still writes into this home, so stop it first.
       - name: Reclaim the isolated Gradle home
-        run: rm -rf "$RUNNER_TEMP/flatpak-gradle-home"
+        run: |
+          ./gradlew -Dgradle.user.home="$RUNNER_TEMP/flatpak-gradle-home" --stop
+          rm -rf "$RUNNER_TEMP/flatpak-gradle-home"
 
       - name: Clone the Flathub packaging repo
         run: |