update ci

triwinds · Apr 8, 2024 · 5e21ccd · 5e21ccd
1 parent 489ec2e
commit 5e21ccd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -39,8 +39,7 @@ jobs:
         poetry config installer.parallel false
         poetry config --list
         poetry install
-        poetry run pyinstaller --noconfirm --onefile --windowed --icon "./web/favicon.ico" --add-data "./module/*.exe;./module/" --add-data "./web;web/" --additional-hooks-dir=".\\hooks" "./main_devnull.py" --name "NsEmuTools"
-        poetry run pyinstaller --noconfirm --onefile --console --icon "./web/favicon.ico" --add-data "./module/*.exe;./module/" --add-data "./web;web/" --additional-hooks-dir=".\\hooks" "./main.py" --name "NsEmuTools-console"
+        .\package_all.bat
 #        pip install pywebview
 #        pyinstaller --noconfirm --onefile --console --icon "./web/favicon.ico" --add-data "./module/*.exe;./module/" --add-data "./web;web/" --additional-hooks-dir=".\\hooks" "./ui_webview.py" --name "NsEmuTools-webview"
     - uses: actions/upload-artifact@v3

diff --git a/package_all.bat b/package_all.bat
@@ -0,0 +1,9 @@
+@echo off
+chcp>nul 2>nul 65001
+:path
+cd>nul 2>nul /D %~dp0
+rem call venv\Scripts\activate.bat
+poetry run pyinstaller --noconfirm --onefile --windowed --upx-dir "./build_tools/upx/" --icon "./web/favicon.ico" --add-data "./module/*.exe;./module/" --add-data "./web;web/"  "./main_devnull.py" --additional-hooks-dir=".\\hooks" --name "NsEmuTools"
+poetry run pyinstaller --noconfirm --onefile --console --upx-dir "./build_tools/upx/" --icon "./web/favicon.ico" --add-data "./module/*.exe;./module/" --add-data "./web;web/"  "./main.py" --additional-hooks-dir=".\\hooks" --name "NsEmuTools-console"
+rem pyinstaller --noconfirm --onefile --console --icon "./web/favicon.ico" --add-data "./module/*.exe;./module/" --add-data "./web;web/"  "./ui_webview.py" --additional-hooks-dir=".\\hooks" --name "NsEmuTools-webview"
+pause