Zimi 1.8.1

.github/workflows/auto-release.yml

@@ -1,8 +1,21 @@
 name: Auto Release
 
-# When a push to main changes the version, auto-tag and create a draft release.
-# The draft body is pulled from CHANGELOG.md. Desktop builds attach assets.
-# Only step left: review the draft and publish.
+# ── Single-draft release flow (there must be exactly ONE draft per tag) ──────
+# When a push to main changes the version in pyproject.toml:
+#   1. this workflow tags vX.Y.Z and creates/updates the draft release, with
+#      notes pulled from CHANGELOG.md;
+#   2. the tag push triggers desktop-release.yml, which builds every platform,
+#      signs the update enclosures, refreshes the appcasts, and attaches the
+#      built assets to the SAME draft (softprops matches the release by tag).
+#   3. the maintainer reviews that one draft and publishes it;
+#   4. publish-release.yml then ships PyPI + snap.
+#
+# The draft step below is IDEMPOTENT on purpose: `gh release create` would
+# happily make a SECOND draft for a tag that already has one (GitHub does not
+# enforce tag-uniqueness on drafts), which is exactly the duplicate "Zimi
+# vX.Y.Z" draft that showed up next to a hand-curated one after PR #39. So if a
+# release for the tag already exists (a maintainer-curated draft, or a re-run),
+# we EDIT it instead of creating a duplicate.
 
 on:
   push:
@@ -78,7 +91,18 @@ jobs:
           ENDNOTES
           # Trim leading whitespace from heredoc
           sed -i 's/^          //' /tmp/release-notes.md
-          gh release create "v${VERSION}" \
-            --draft \
-            --title "Zimi v${VERSION}" \
-            --notes-file /tmp/release-notes.md
+          # One draft per tag: update an existing release (curated draft or a
+          # re-run) instead of creating a duplicate. `gh release view` finds
+          # drafts by tag too.
+          if gh release view "v${VERSION}" >/dev/null 2>&1; then
+            # A curated draft already exists (a human wrote the release body).
+            # Preserve it — do NOT overwrite the notes with the changelog
+            # extract. The tag was created above; the draft binds to it on
+            # publish. This is the one-draft-per-tag path.
+            echo "Release v${VERSION} already exists — preserving its curated notes"
+          else
+            gh release create "v${VERSION}" \
+              --draft \
+              --title "Zimi v${VERSION}" \
+              --notes-file /tmp/release-notes.md
+          fi

.github/workflows/desktop-release.yml

@@ -55,7 +55,7 @@ jobs:
             gcc libcairo2-dev pkg-config python3-dev
 
       - name: Install dependencies
-        run: pip install -r requirements-desktop.txt
+        run: pip install -r desktop/requirements-desktop.txt
 
       - name: Install libtorrent (in-process BT engine)
         shell: bash
@@ -139,7 +139,7 @@ jobs:
           "
 
       - name: Build with PyInstaller
-        run: pyinstaller --noconfirm zimi_desktop.spec
+        run: pyinstaller --noconfirm desktop/zimi_desktop.spec
 
       # ── Post-build smoke tests ────────────────────────────────────────
 
@@ -459,8 +459,9 @@ jobs:
 
           # Sign one enclosure and write its appcast.
           #   $1 label  $2 file-to-sign  $3 release-asset  $4 outfile  $5 min-sys line
+          #   $6 extra enclosure attributes (e.g. sparkle:installerArguments)
           generate_appcast() {
-            local LABEL="$1" FILE="$2" ASSET="$3" OUTFILE="$4" MINSYS="$5"
+            local LABEL="$1" FILE="$2" ASSET="$3" OUTFILE="$4" MINSYS="$5" ENC_EXTRA="$6"
             if [ ! -f "$FILE" ]; then
               echo "WARNING: No $LABEL enclosure found at $FILE"
               return 1
@@ -493,7 +494,7 @@ jobs:
                   url="https://github.com/${REPO}/releases/download/${TAG}/${ASSET}"
                   length="${LENGTH}"
                   type="application/octet-stream"
-                  sparkle:edSignature="${ED_SIG}"
+                  sparkle:edSignature="${ED_SIG}"${ENC_EXTRA}
                 />
               </item>
             </channel>
@@ -505,11 +506,16 @@ jobs:
           }
 
           MAC_MINSYS=$'\n            <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>'
-          generate_appcast "Intel" "Zimi-Intel/Zimi-Intel.dmg" "Zimi-Intel.dmg" "appcast-intel.xml" "$MAC_MINSYS"
-          generate_appcast "Apple Silicon" "Zimi-AppleSilicon/Zimi-AppleSilicon.dmg" "Zimi-AppleSilicon.dmg" "appcast-arm64.xml" "$MAC_MINSYS"
-          # Windows enclosure is the Inno Setup installer; WinSparkle downloads
-          # and runs it to apply the update. No minimumSystemVersion line.
-          generate_appcast "Windows" "Zimi-windows-x64-Setup/Zimi-windows-x64-Setup.exe" "Zimi-windows-x64-Setup.exe" "appcast-windows.xml" ""
+          generate_appcast "Intel" "Zimi-Intel/Zimi-Intel.dmg" "Zimi-Intel.dmg" "appcast-intel.xml" "$MAC_MINSYS" ""
+          generate_appcast "Apple Silicon" "Zimi-AppleSilicon/Zimi-AppleSilicon.dmg" "Zimi-AppleSilicon.dmg" "appcast-arm64.xml" "$MAC_MINSYS" ""
+          # Windows enclosure is the Inno Setup installer; WinSparkle (0.9.4)
+          # downloads it, runs it with sparkle:installerArguments via
+          # ShellExecuteEx, then quits WITHOUT relaunching — so /SILENT gives a
+          # click-free progress-only update and the installer's [Run] entry does
+          # the relaunch (windows/zimi.iss). /SP- skips the "ready to install"
+          # prompt. Per-user install (no UAC), so silent is safe.
+          WIN_INSTALLER_ARGS=' sparkle:installerArguments="/SILENT /SP-"'
+          generate_appcast "Windows" "Zimi-windows-x64-Setup/Zimi-windows-x64-Setup.exe" "Zimi-windows-x64-Setup.exe" "appcast-windows.xml" "" "$WIN_INSTALLER_ARGS"
 
           # Commit and push to main
           git config user.name "github-actions[bot]"

.github/workflows/publish-release.yml

@@ -34,12 +34,21 @@ jobs:
       - name: Download Snap from release
         env:
           GH_TOKEN: ${{ github.token }}
+          VERSION: ${{ github.event.release.tag_name }}
         run: |
-          VERSION="${{ github.event.release.tag_name }}"
-          gh release download "$VERSION" --repo epheterson/Zimi --pattern "*.snap" || true
-          SNAP_FILE=$(ls *.snap 2>/dev/null | head -1)
+          # The snap is attached by the Desktop Release workflow, which is
+          # usually still building when the release-published event fires.
+          # Poll for up to 60 minutes instead of racing it (the 1.8.0 snap
+          # silently missed the store because of this exact race).
+          for i in $(seq 1 30); do
+            gh release download "$VERSION" --repo epheterson/Zimi --pattern "*.snap" || true
+            SNAP_FILE=$(ls *.snap 2>/dev/null | head -1)
+            [ -n "$SNAP_FILE" ] && break
+            echo "Snap not attached yet (attempt $i/30) — waiting 2m"
+            sleep 120
+          done
           if [ -z "$SNAP_FILE" ]; then
-            echo "No snap found in release $VERSION — skipping publish"
+            echo "No snap found in release $VERSION after 60m — skipping publish"
             echo "SNAP_FOUND=false" >> $GITHUB_ENV
           else
             echo "Found: $SNAP_FILE"