From 056d6d6f88fbb2c36141c632ffa593c14e8aa0ac Mon Sep 17 00:00:00 2001
From: NtskwK <natsukawa247@outlook.com>
Date: Tue, 11 Jun 2024 00:16:19 +0800
Subject: [PATCH] Update build_parallel.yaml

---
 .github/workflows/build.yaml          | 11 ++++++-----
 .github/workflows/build_parallel.yaml | 16 ++++++++++------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f5d22c8..7edc5fb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -74,17 +74,18 @@ jobs:
 
       - name: building and pack
         run: |
-           mkdir "dist/win-unpacked/bin/OTB-9.0.0-Win64"
            pip install -r requirements.txt
            pip install nuitka 
-           nuitka main.py
+           nuitka main.py --standalone
            npm install
            npm run pack
-
-           cp -r "data" "main.dist" 
+           dir
+            
            ren "main.dist" "bin"
-           cp -r "bin" "dist/win-unpacked/"
+           cp -r "bin" "dist/win-unpacked"
            cp -r "OTB-9.0.0-Win64" "dist/win-unpacked/bin"
+           cp -r "data" "dist/win-unpacked/bin"
+           dir
            dir dist
            dir "dist/win-unpacked"
            dir "dist/win-unpacked/bin"
diff --git a/.github/workflows/build_parallel.yaml b/.github/workflows/build_parallel.yaml
index 1d57961..b4c8ada 100644
--- a/.github/workflows/build_parallel.yaml
+++ b/.github/workflows/build_parallel.yaml
@@ -63,7 +63,7 @@ jobs:
         run: |
            pip install -r requirements.txt
            pip install nuitka 
-           nuitka main.py
+           nuitka main.py --standalone
 
            cp -r "data" "main.dist" 
            ren "main.dist" "bin"
@@ -115,6 +115,7 @@ jobs:
         run: |
            npm install
            npm run pack
+           tree
 
       - name: Upload
         uses: actions/upload-artifact@v4
@@ -122,7 +123,7 @@ jobs:
           # Artifact name
           name: electron_app
           # A file, directory or wildcard pattern that describes what to upload
-          path: "build/win-unpacke"
+          path: "dist/win-unpacked"
 
   pack_app:
     needs: [download_otb, build_python_app, build_electron_app]
@@ -171,7 +172,7 @@ jobs:
           # Name of the artifact to download.
           # If unspecified, all artifacts for the run are downloaded.
           # Optional.
-          name: OTB-9.0.0-Win64
+          name: bin
 
       - uses: actions/download-artifact@v4
         with:
@@ -179,10 +180,13 @@ jobs:
           # If unspecified, all artifacts for the run are downloaded.
           # Optional.
           name: electron_app
+          path: win_64
           
       - run: |
+          7z x -o"win_64" "bin.zip" 
+          7z x -o"win_64/bin" "OTB-9.0.0-Win64.zip"
           dir
-          dir bin
-          dir electron_app
-          dir OTB-9.0.0-Win64
+          dir "win_64"
+          dir "win_64/bin"
+          dir "win_64/bin/OTB-9.0.0-Win64"