From c9b3f6981cf8b080e3cb41c2eda5b94cad1a3f49 Mon Sep 17 00:00:00 2001
From: joshrmcdaniel <80354972+joshrmcdaniel@users.noreply.github.com>
Date: Fri, 2 Oct 2026 08:19:14 -0500
Subject: [PATCH 1/2] fix: include curated CI release notes

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 50dd34f1..bfa7f286 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -462,6 +462,9 @@ jobs:
     permissions:
       contents: write
     steps:
+      - name: Checkout release notes
+        uses: actions/checkout@v6
+
       - name: Download all artifacts
         uses: actions/download-artifact@v4
         with:
@@ -485,6 +488,7 @@ jobs:
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:
+          body_path: RELEASE.md
           files: ./release-assets/*
           generate_release_notes: true
-          fail_on_unmatched_files: true
\ No newline at end of file
+          fail_on_unmatched_files: true

From 1e73042b2da5c06abee4875e2f8deb3144bf16a6 Mon Sep 17 00:00:00 2001
From: joshrmcdaniel <80354972+joshrmcdaniel@users.noreply.github.com>
Date: Fri, 2 Oct 2026 08:23:45 -0500
Subject: [PATCH 2/2] fix: exclude stale packages from release assets

---
 .github/workflows/ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bfa7f286..7c2ec069 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -355,6 +355,9 @@ jobs:
       - name: Build packages
         if: ${{ !endsWith(matrix.target, '-musl') }}
         run: |
+          # target/ is cached; discard packages from previous versions.
+          rm -f target/${{ matrix.target }}/release/privaxy_*.deb \
+                target/${{ matrix.target }}/release/privaxy-*.rpm
           cargo install cargo-deb && cargo deb -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
           cargo install cargo-generate-rpm && cargo generate-rpm -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
       - uses: actions/upload-artifact@v4
@@ -366,7 +369,7 @@ jobs:
         if: ${{ !endsWith(matrix.target, '-musl') }}
         with:
           name: privaxy-rpm-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/*.rpm
+          path: target/${{ matrix.target }}/release/privaxy-*.rpm
       - uses: actions/upload-artifact@v4
         with:
           name: privaxy-${{ matrix.target }}
@@ -432,6 +435,9 @@ jobs:
       - name: Build packages
         if: ${{ endsWith(matrix.target, '-linux-gnu') }}
         run: |
+          # target/ is cached; discard packages from previous versions.
+          rm -f target/${{ matrix.target }}/release/privaxy_*.deb \
+                target/${{ matrix.target }}/release/privaxy-*.rpm
           variant=$(echo "${{ matrix.target }}" | cut -d- -f1)
           cargo install cargo-deb && cargo deb --no-build --no-strip --variant "$variant" -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
           cargo install cargo-generate-rpm && cargo generate-rpm -p privaxy --target ${{ matrix.target }} -o target/${{ matrix.target }}/release
@@ -446,7 +452,7 @@ jobs:
         if: ${{ endsWith(matrix.target, '-linux-gnu') }}
         with:
           name: privaxy-rpm-${{ matrix.target }}
-          path: target/${{ matrix.target }}/release/*.rpm
+          path: target/${{ matrix.target }}/release/privaxy-*.rpm
 
       - uses: actions/upload-artifact@v4
         with: