From eb0246baaefc3e97c9fc912dfd418b3902194a55 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 22 Nov 2024 21:43:57 +0100
Subject: [PATCH] Split packaging for each target on CI

Create separate jobs for packaging the win32 and the win64 releases.
---
 .github/workflows/release.yml | 70 +++++++++++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 994c55fa..f7ac87cb 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -119,11 +119,10 @@ jobs:
           name: build-win64-intermediate
           path: release/work/build-win64/dist/
 
-  package:
+  package-win32:
     needs:
       - build-scrcpy-server
       - build-win32
-      - build-win64
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -141,21 +140,76 @@ jobs:
           name: build-win32-intermediate
           path: release/work/build-win32/dist/
 
+      - name: Package win32
+        run: release/package_client.sh win32
+
+      - name: Upload win32 release
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-win32
+          path: release/output/
+
+  package-win64:
+    needs:
+      - build-scrcpy-server
+      - build-win64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download scrcpy-server
+        uses: actions/download-artifact@v4
+        with:
+          name: scrcpy-server
+          path: release/work/build-server/server/
+
       - name: Download build-win64
         uses: actions/download-artifact@v4
         with:
           name: build-win64-intermediate
           path: release/work/build-win64/dist/
 
-      - name: Package server
-        run: release/package_server.sh
-
-      - name: Package win32
-        run: release/package_client.sh win32
-
       - name: Package win64
         run: release/package_client.sh win64
 
+      - name: Upload win64 release
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-win64
+          path: release/output
+
+  release:
+    needs:
+      - build-scrcpy-server
+      - package-win32
+      - package-win64
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Download scrcpy-server
+        uses: actions/download-artifact@v4
+        with:
+          name: scrcpy-server
+          path: release/work/build-server/server/
+
+      - name: Download release-win32
+        uses: actions/download-artifact@v4
+        with:
+          name: release-win32
+          path: release/output/
+
+      - name: Download release-win64
+        uses: actions/download-artifact@v4
+        with:
+          name: release-win64
+          path: release/output/
+
+      - name: Package server
+        run: release/package_server.sh
+
       - name: Generate checksums
         run: release/generate_checksums.sh