From 6f42f078878258b334ae5b234c08caf76d2fa817 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Tue, 12 May 2026 07:11:19 -0500
Subject: [PATCH] fix(ci): resolve flatpak source merge race condition (#5419)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .github/workflows/release.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 24cd59e57..67df001ba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -410,14 +410,17 @@ jobs:
         uses: actions/download-artifact@v8
         with:
           pattern: flatpak-multisrc-*
-          merge-multiple: true
-      
+          path: flatpak-multisrc
+
       - name: List Flatpak source files
-        run: ls -R flatpak-sources-*.json
+        run: ls -R flatpak-multisrc/
+
+      - name: Validate Flatpak source files
+        run: jq empty flatpak-multisrc/*/*.json
 
       - name: Combine Flatpak source files
         run: >
-          jq -s 'add | unique_by(.dest + "/" + .["dest-filename"])' flatpak-sources-*.json
+          jq -s 'add | unique_by(.dest + "/" + .["dest-filename"])' flatpak-multisrc/*/*.json
           > flatpak-sources.json
 
       - name: Upload combined Flatpak source artifact