From 6073804c9915cf7beeced96c7aa7c2c1dd3f1324 Mon Sep 17 00:00:00 2001
From: clsferguson <48876201+clsferguson@users.noreply.github.com>
Date: Tue, 30 Sep 2025 22:31:21 -0600
Subject: [PATCH] Update sync-build-release.yml

---
 .github/workflows/sync-build-release.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sync-build-release.yml b/.github/workflows/sync-build-release.yml
index 4e2e9b6c1..8d66e8b4e 100644
--- a/.github/workflows/sync-build-release.yml
+++ b/.github/workflows/sync-build-release.yml
@@ -109,7 +109,7 @@ jobs:
           git add README.md
           git commit -m "Merge upstream/master, keep local README.md" || true
           git push origin master
-          
+
       - name: Show disk usage (pre)
         run: df -h | sed 's/\s\+/ /g'
 
@@ -131,7 +131,7 @@ jobs:
 
       - name: Show disk usage (post-clean)
         run: df -h | sed 's/\s\+/ /g'
-        
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
@@ -268,6 +268,21 @@ jobs:
         if: ${{ success() && steps.build.outputs.digest != '' }}
         run: echo "built=true" >> "$GITHUB_OUTPUT"
 
+      - name: Remove BuildKit image (moby/buildkit)
+        if: ${{ always() }}
+        shell: bash
+        run: |
+          set -euxo pipefail
+          docker image rm -f $(docker images 'moby/buildkit*' -q) 2>/dev/null || true
+
+      - name: Cleanup (always, scoped)
+        if: ${{ always() }}
+        run: |
+          set -euxo pipefail
+          docker buildx prune -af || true
+          docker image prune -af --filter "until=168h" || true
+          rm -rf "${GITHUB_WORKSPACE:?}/"* "${GITHUB_WORKSPACE:?}/."[!.]* 2>/dev/null || true
+
   publish:
     name: Publish Release
     needs: [check-upstream, build-gh, build-self]