From f1602fde4ccf4f976f60c027e673eaa8664218aa Mon Sep 17 00:00:00 2001 From: git-echo Date: Wed, 27 May 2026 20:21:23 -0500 Subject: [PATCH] fix: preserve abuild directory structure in Alpine cleanup - Replace aggressive rm -rf /home/builduser/packages/ with targeted rm -f of stale .apk files - Add mkdir -p to ensure abuild output directory exists before build - Fixes Alpine CI build failure caused by removing required directory structure --- .gitea/workflows/ci.yml | 3 ++- build-alpine.sh | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index cf99b18..00497ab 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -324,7 +324,8 @@ jobs: - name: Clean stale Alpine packages run: | rm -f releases/linux-patch-api-*.apk 2>/dev/null || true - rm -rf /home/builduser/packages/ 2>/dev/null || true + rm -f /home/builduser/packages/home/x86_64/linux-patch-api-*.apk 2>/dev/null || true + mkdir -p /home/builduser/packages/home/x86_64/ - name: Build Alpine package run: | chmod +x build-alpine.sh diff --git a/build-alpine.sh b/build-alpine.sh index 24ab1d0..4153c14 100644 --- a/build-alpine.sh +++ b/build-alpine.sh @@ -10,8 +10,9 @@ echo "" # Clean stale packages from previous builds rm -f releases/linux-patch-api-*.apk 2>/dev/null || true -rm -rf /home/builduser/packages/home/x86_64/ 2>/dev/null || true -rm -rf /home/builduser/packages/ 2>/dev/null || true +rm -f /home/builduser/packages/home/x86_64/linux-patch-api-*.apk 2>/dev/null || true +# Ensure abuild output directory exists +mkdir -p /home/builduser/packages/home/x86_64/ # Source cargo environment (for rustup-installed toolchain in CI) if [ -f "$HOME/.cargo/env" ]; then