From 54338bd4f3c14bde92efcaac896ae9048ce5eaa7 Mon Sep 17 00:00:00 2001
From: Ivan Lukyanets <lukyanets.ivan@gmail.com>
Date: Wed, 8 Apr 2026 12:18:39 +0300
Subject: [PATCH] Fix CI: flatten artifacts for release, add release
 description
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Collect built files (dmg/exe/deb/AppImage) into flat dist-artifacts/
  directory before upload — avoids nested path issues
- merge-multiple: true on download to flatten all platform artifacts
- Add release body with install instructions per platform
- List files before upload for debugging

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .github/workflows/build.yml | 43 ++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3cfb67b..2e6a4a7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,12 +20,7 @@ jobs:
           - platform: macos-latest
             target: aarch64-apple-darwin
             label: macOS-ARM64
-          # macOS x64 temporarily disabled:
-          # ort-sys has no prebuilt ONNX Runtime for x86_64-apple-darwin
-          # TODO: re-enable with ort-coreml or custom ONNX build
-          # - platform: macos-latest
-          #   target: x86_64-apple-darwin
-          #   label: macOS-x64
+          # macOS x64 disabled: ort-sys has no prebuilt ONNX for x86_64-apple-darwin
           - platform: ubuntu-24.04
             target: x86_64-unknown-linux-gnu
             label: Linux-x64
@@ -89,15 +84,21 @@ jobs:
           tauriScript: pnpm tauri
           args: --target ${{ matrix.target }}
 
+      # Collect built files into a flat directory for easy upload
+      - name: Collect artifacts
+        shell: bash
+        run: |
+          mkdir -p dist-artifacts
+          find src-tauri/target/${{ matrix.target }}/release/bundle \
+            \( -name "*.dmg" -o -name "*.exe" -o -name "*.deb" -o -name "*.AppImage" \) \
+            -exec cp {} dist-artifacts/ \;
+          ls -lh dist-artifacts/
+
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: HandyFiles-${{ matrix.label }}
-          path: |
-            src-tauri/target/${{ matrix.target }}/release/bundle/dmg/*.dmg
-            src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*.exe
-            src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
-            src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage
+          path: dist-artifacts/*
           if-no-files-found: ignore
 
   # Create GitHub Release when a tag is pushed
@@ -113,10 +114,26 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: artifacts
+          merge-multiple: true
+
+      - name: List release files
+        run: ls -lhR artifacts/
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           draft: true
-          generate_release_notes: true
-          files: artifacts/**/*
+          name: HandyFiles ${{ github.ref_name }}
+          body: |
+            ## HandyFiles ${{ github.ref_name }}
+
+            Cross-platform desktop app for transcribing audio/video files locally.
+
+            ### Install
+            - **macOS (Apple Silicon):** Download `.dmg`, open, drag to Applications, run `xattr -cr /Applications/HandyFiles.app`
+            - **Windows:** Download `.exe` installer
+            - **Linux:** Download `.deb` or `.AppImage`
+
+            ### What's new
+            See [full changelog](https://github.com/${{ github.repository }}/blob/main/README.md).
+          files: artifacts/*