From 3b020289cb5e256d8295ce9968b416cc8763d575 Mon Sep 17 00:00:00 2001 From: hisatri Date: Tue, 31 Dec 2024 23:44:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E5=8E=BB=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9A=84=E5=A4=9A=E4=BD=99=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eb2d79c..23664e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,7 +66,6 @@ jobs: - name: Archive release files run: | - mkdir -p dist Compress-Archive -Path dist\* -DestinationPath release-windows.zip - name: Upload release artifact From 2b0e3bf346e6c996947f2b9512ba0d45869ad48a Mon Sep 17 00:00:00 2001 From: hisatri Date: Tue, 31 Dec 2024 23:57:23 +0800 Subject: [PATCH 2/4] no message --- .github/workflows/release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 23664e4..da9aee0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,6 @@ jobs: - name: Archive release files run: | - mkdir -p dist zip -r release.zip dist - name: Upload release artifact From 053022e4cb4dc78f4e5ba19e3e1f267b1e05f782 Mon Sep 17 00:00:00 2001 From: hisatri Date: Wed, 1 Jan 2025 00:07:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=86`buildup.py`=E4=B8=AD=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E4=BE=9D=E8=B5=96=E6=97=B6=E6=9C=BA=E6=8F=90=E5=89=8D?= =?UTF-8?q?=E8=87=B3=E5=BC=95=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 1 + buildup.py | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da9aee0..23664e4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,7 @@ jobs: - name: Archive release files run: | + mkdir -p dist zip -r release.zip dist - name: Upload release artifact diff --git a/buildup.py b/buildup.py index 012bd7d..57254b4 100644 --- a/buildup.py +++ b/buildup.py @@ -4,6 +4,12 @@ import codecs import os +# 安装Pyinstaller及主程序依赖 +# 必须在import项目中的模块之前执行，否则会出现找不到模块的错误 +print("安装Pyinstaller及主程序依赖") +subprocess.run("pip install -r requirements.txt", shell=True) +subprocess.run("pip install pyinstaller", shell=True) + from mod.args import GlobalArgs sys.stdout = codecs.getwriter("utf-8")(sys.stdout.detach()) @@ -19,11 +25,6 @@ APP_VERSION = GlobalArgs().version PACK_NAME = f"{APP_NAME}-{APP_VERSION}-{PLATFORM}-{ARCHITECTURE}{'.exe' if PLATFORM == 'Windows' else ''}" -# 安装Pyinstaller及主程序依赖 -subprocess.run("pip install -r requirements.txt", shell=True) -subprocess.run("pip install pyinstaller", shell=True) - - # 打包 def generate_add_data_options(root_dir): options = [] From d71e64fb6054ea39446db4454638f49a00fcf094 Mon Sep 17 00:00:00 2001 From: hisatri Date: Wed, 1 Jan 2025 00:16:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8D=E6=94=AF=E6=8C=81=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E5=AD=97=E7=AC=A6=EF=BC=8CWhat=20can=20I=20say=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildup.py b/buildup.py index 57254b4..52f2a37 100644 --- a/buildup.py +++ b/buildup.py @@ -6,7 +6,7 @@ # 安装Pyinstaller及主程序依赖 # 必须在import项目中的模块之前执行，否则会出现找不到模块的错误 -print("安装Pyinstaller及主程序依赖") +print("Installing dependencies...") subprocess.run("pip install -r requirements.txt", shell=True) subprocess.run("pip install pyinstaller", shell=True)