From 23142a7053c58d9edcc04a6bd240e85ae3600062 Mon Sep 17 00:00:00 2001
From: blueloveTH <blueloveth@hclcat.games>
Date: Wed, 7 Dec 2022 04:29:20 +0800
Subject: [PATCH] adjust artifact

Update main.yml

Update main.yml
---
 .github/workflows/main.yml | 40 +++++++++++++++++++++-----------------
 amalgamate.py              |  6 ++++--
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 98ab6e44..25fe6f1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,7 +4,7 @@ jobs:
   build_win:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ilammy/msvc-dev-cmd@v1
     - name: Compiling
       shell: bash
@@ -12,16 +12,16 @@ jobs:
         CL -std:c++17 -utf-8 -O2 -EHsc -Fe:pocketpy src/main.cpp
         mv src/pocketpy.h src/pocketpy.cpp
         CL -std:c++17 -utf-8 -O2 -EHsc -LD -Fe:pocketpy src/pocketpy.cpp
+        mkdir -p output/windows/x86_64
+        mv pocketpy.exe output/windows/x86_64
+        mv pocketpy.dll output/windows/x86_64
     - uses: actions/upload-artifact@v3
       with:
-        name: pocketpy
-        path: |
-          D:\a\pocketpy\pocketpy\pocketpy.exe
-          D:\a\pocketpy\pocketpy\pocketpy.dll
+        path: output
   build_web:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: mymindstorm/setup-emsdk@v11
     - name: Compiling
       run: |
@@ -35,16 +35,21 @@ jobs:
   build_test_linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Compiling
       run: |
         bash build_cpp.sh
         python3 scripts/run_tests.py
         ./pocketpy tests/1.py
+        mkdir -p output/linux/x86_64
+        mv pocketpy output/linux/x86_64
+    - uses: actions/upload-artifact@v3
+      with:
+        path: output
   build_android:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
         flutter-version: '3.3.9'
@@ -56,19 +61,18 @@ jobs:
         cd plugins/flutter/example
         flutter build apk --split-debug-info=.debug-info --split-per-abi
         cd build/app/outputs/flutter-apk
-        mkdir -p output/arm64-v8a
-        mkdir -p output/armeabi-v7a
-        mkdir -p output/x86_64
-        unzip app-arm64-v8a-release.apk -d tmp
-        mv tmp/lib/arm64-v8a/libpocketpy.so output/arm64-v8a/libpocketpy.so
+        mkdir -p output/android/arm64-v8a
+        mkdir -p output/android/armeabi-v7a
+        mkdir -p output/android/x86_64
+        unzip -q app-arm64-v8a-release.apk -d tmp
+        mv tmp/lib/arm64-v8a/libpocketpy.so output/android/arm64-v8a/libpocketpy.so
         rm -rf tmp
-        unzip app-armeabi-v7a-release.apk -d tmp
-        mv tmp/lib/armeabi-v7a/libpocketpy.so output/armeabi-v7a/libpocketpy.so
+        unzip -q app-armeabi-v7a-release.apk -d tmp
+        mv tmp/lib/armeabi-v7a/libpocketpy.so output/android/armeabi-v7a/libpocketpy.so
         rm -rf tmp
-        unzip app-x86_64-release.apk -d tmp
-        mv tmp/lib/x86_64/libpocketpy.so output/x86_64/libpocketpy.so
+        unzip -q app-x86_64-release.apk -d tmp
+        mv tmp/lib/x86_64/libpocketpy.so output/android/x86_64/libpocketpy.so
         rm -rf tmp
     - uses: actions/upload-artifact@v3
       with:
-        name: pocketpy
         path: plugins/flutter/example/build/app/outputs/flutter-apk/output
\ No newline at end of file
diff --git a/amalgamate.py b/amalgamate.py
index 5b7fd1a6..dd6ab60d 100644
--- a/amalgamate.py
+++ b/amalgamate.py
@@ -55,5 +55,7 @@ os.system("g++ -o pocketpy amalgamated/main.cpp --std=c++17 -pthread")
 os.system("rm pocketpy")
 
 os.system("cp amalgamated/pocketpy.h plugins/flutter/src/pocketpy.h")
-os.system("cp amalgamated/pocketpy.h plugins/godot/godot-cpp/pocketpy/src/pocketpy.h")
-os.system("cp amalgamated/pocketpy.h plugins/unity/Assets/PocketPy/Plugins/iOS/pocketpy.h")
\ No newline at end of file
+os.system("cp amalgamated/pocketpy.h plugins/unity/Assets/PocketPy/Plugins/iOS/pocketpy.h")
+
+if os.path.exists("plugins/godot/godot-cpp/pocketpy"):
+	os.system("cp amalgamated/pocketpy.h plugins/godot/godot-cpp/pocketpy/src/pocketpy.h")
\ No newline at end of file