From 0b404a51cbcb4fce4927b73944a7f07da4c54491 Mon Sep 17 00:00:00 2001
From: Non <43197300+nonperforming@users.noreply.github.com>
Date: Wed, 5 Jun 2024 02:54:10 +1200
Subject: [PATCH] Merge artifacts (#258)

* Merge artifacts

* Fix windows artifact name

* Update main.yml

---------

Co-authored-by: blueloveTH <blueloveTH@foxmail.com>
---
 .github/workflows/main.yml | 55 +++++++++++++++++++++++++++++++++-----
 1 file changed, 49 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 051381d0..2f288ad5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,10 +22,10 @@ jobs:
         python amalgamate.py
         cd amalgamated
         cl.exe /std:c++17 /EHsc /utf-8 /Ox /I. /DPK_ENABLE_OS=1 main.cpp /link /out:pkpy.exe
-    - uses: actions/upload-artifact@v4
-      with:
-        name: amalgamated
-        path: amalgamated/pkpy.exe
+    # - uses: actions/upload-artifact@v4
+    #   with:
+    #     name: amalgamated
+    #     path: amalgamated/pkpy.exe
   build_win32:
     runs-on: windows-latest
     steps:
@@ -111,9 +111,9 @@ jobs:
       - run: |
           python amalgamate.py
           cd plugins/macos/pocketpy
-          mkdir -p output/macos
+          mkdir output
           xcodebuild clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
-          cp -r build/Release/pocketpy.bundle output/macos
+          cp -r build/Release/pocketpy.bundle output
       - uses: actions/upload-artifact@v4
         with:
           name: macos
@@ -161,3 +161,46 @@ jobs:
         with:
           name: ios
           path: output
+
+  merge:
+      runs-on: ubuntu-latest
+      needs: [ build_win32, build_linux, build_darwin, build_android, build_ios ]
+      steps:
+      - name: "Create output directory"
+        run: "mkdir $GITHUB_WORKSPACE/output"
+        
+      - name: "Merge win32"
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: windows
+          path: $GITHUB_WORKSPACE/output/windows
+
+      - name: "Merge linux"
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: linux
+          path: $GITHUB_WORKSPACE/output/linux
+
+      - name: "Merge darwin"
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: macos
+          path: $GITHUB_WORKSPACE/output/macos
+
+      - name: "Merge android"
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: android
+          path: $GITHUB_WORKSPACE/output/android
+          
+      - name: "Merge ios"
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: ios
+          path: $GITHUB_WORKSPACE/output/ios
+
+      - name: "Upload merged artifact"
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: all-in-one
+          path: $GITHUB_WORKSPACE/output