diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 56e10ce..cf99b18 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -185,6 +185,12 @@ jobs: run: | TAG_NAME=${GITHUB_REF#refs/tags/} FILE=$(ls ../linux-patch-api_*.deb 2>/dev/null | head -1) + # Rename deb to include u2404 in filename to distinguish from u2204 build + if [ -n "$FILE" ]; then + U2404_FILE="$(echo "$FILE" | sed 's/_amd64/_u2404_amd64/')" + mv "$FILE" "$U2404_FILE" + FILE="$U2404_FILE" + fi chmod +x scripts/upload-release.sh ./scripts/upload-release.sh "$TAG_NAME" "$FILE" @@ -318,19 +324,23 @@ 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 - name: Build Alpine package run: | chmod +x build-alpine.sh SKIP_CARGO_BUILD=1 ./build-alpine.sh - - name: Upload to Gitea Release - if: github.ref_type == 'tag' - env: - GITEA_TOKEN: ${{ secrets.GITEATOKEN }} + - name: Verify Alpine package run: | - TAG_NAME=${GITHUB_REF#refs/tags/} - FILE=$(ls releases/*.apk 2>/dev/null | head -1) - chmod +x scripts/upload-release.sh - ./scripts/upload-release.sh "$TAG_NAME" "$FILE" + EXPECTED_VERSION=$(grep '^version' Cargo.toml | head -1 | sed 's/.*=.*"\([^"]*\)".*/\1/') + FILE=$(ls releases/linux-patch-api-*.apk 2>/dev/null | head -1) + if [ -z "$FILE" ]; then + echo "ERROR: No Alpine package found!" + exit 1 + fi + echo "Expected version: $EXPECTED_VERSION" + echo "Package file: $FILE" + # Verify filename contains expected version + if ! echo "$FILE" | grep -q "$EXPECTED_VERSION build-arch: name: Build Arch Package diff --git a/build-alpine.sh b/build-alpine.sh index 46adb63..24ab1d0 100644 --- a/build-alpine.sh +++ b/build-alpine.sh @@ -10,7 +10,8 @@ echo "" # Clean stale packages from previous builds rm -f releases/linux-patch-api-*.apk 2>/dev/null || true -rm -f /home/builduser/packages/home/x86_64/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 # Source cargo environment (for rustup-installed toolchain in CI) if [ -f "$HOME/.cargo/env" ]; then diff --git a/debian/changelog b/debian/changelog index b924a35..806b538 100644 --- a/debian/changelog +++ b/debian/changelog @@ -187,11 +187,4 @@ linux-patch-api (0.3.2-1) unstable; urgency=low * Bump version to 0.3.2 -- Echo Fri, 02 May 2026 21:30:00 -0500 -linux-patch-api (1.1.12) unstable; urgency=medium - - * Add APK (Alpine Linux) package manager backend - * Add machine-id generation to Alpine pre-install script - * Fix OpenRC init script ownership (root:root) - - -- Echo Tue, 20 May 2026 12:25:00 -0500