From 1e507a71fa67cdaf15d21c3d13508524c08eed00 Mon Sep 17 00:00:00 2001
From: Anders da Silva Rytter Hansen <gitnf@a.rytter.me>
Date: Wed, 27 May 2026 14:51:38 -0300
Subject: [PATCH] Scrub mock chroot before build and force --clean on rebuild

Cancelled jobs can leave the mock chroot in a corrupted state, causing
either 'Failed to resolve user mockbuild' or missing directories like
/var/lib/mock/custom/root/var. Add --scrub=chroot before build and
--clean flag to --rebuild to always start from a fresh chroot.
---
 .forgejo/workflows/build-rpms.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.forgejo/workflows/build-rpms.yml b/.forgejo/workflows/build-rpms.yml
index 14e4ef3..2e20db4 100644
--- a/.forgejo/workflows/build-rpms.yml
+++ b/.forgejo/workflows/build-rpms.yml
@@ -72,9 +72,11 @@ jobs:
           """
           MOCKEOF
           cp /tmp/mock-custom.cfg /etc/mock/custom.cfg
+          mock --root custom --scrub=chroot || true
           mock \
             --root custom \
             --resultdir "${HOME}/mock-results" \
+            --clean \
             --rebuild "${{ env.SRPM_PATH }}"
 
       - name: Upload RPMs to Forgejo Package Registry