From 8279bae0b6485d8969e36a5d7b5326a18c9cfaaf Mon Sep 17 00:00:00 2001 From: Night-stars-1 Date: Wed, 12 Feb 2025 00:38:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ci:=20=E6=94=AF=E6=8C=81=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_release.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 1430536..f5bfe39 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -35,25 +35,25 @@ jobs: - name: Pip Install run: | python -m pip install --upgrade pip - pip install pyinstaller requests + pip install -r requirements.txt pyinstaller - name: Set VERSION run: echo "__version__='${{ github.ref_name }}'" > version.py - # - name: Generate program - # shell: pwsh - # run: | - # $SITE_PACKAGES = python -c "import site; print(site.getsitepackages()[0])" - # pyinstaller -D --distpath .\dist\ -i app\resource\images\logo.ico -n HeiYue gui.py -y -w --add-data "$SITE_PACKAGES\lib\site-packages\cnocr\label_cn.txt;cnocr" --add-data "$SITE_PACKAGES\lib\site-packages\cnocr\label_number.txt;cnocr" --add-data "$SITE_PACKAGES\lib\site-packages\onnxruntime\capi\onnxruntime_providers_shared.dll;onnxruntime\capi" --hidden-import=scipy.special._cdflib - # pyinstaller -F --distpath .\dist\updater -i app\resource\images\logo.ico -n "HeiYue Updater" updater.py -y + - name: Generate program + shell: pwsh + run: | + $SITE_PACKAGES = python -c "import site; print(site.getsitepackages()[0])" + pyinstaller -D --distpath .\dist\ -i app\resource\images\logo.ico -n HeiYue gui.py -y -w --add-data "$SITE_PACKAGES\lib\site-packages\cnocr\label_cn.txt;cnocr" --add-data "$SITE_PACKAGES\lib\site-packages\cnocr\label_number.txt;cnocr" --add-data "$SITE_PACKAGES\lib\site-packages\onnxruntime\capi\onnxruntime_providers_shared.dll;onnxruntime\capi" --hidden-import=scipy.special._cdflib + pyinstaller -F --distpath .\dist\updater -i app\resource\images\logo.ico -n "HeiYue Updater" updater.py -y - # - name: Move assets to dist directory - # run: | - # Copy-Item -Path ".\actions\" -Destination ".\dist\heiyue\actions\" -Recurse -Force - # Copy-Item -Path ".\resources\" -Destination ".\dist\heiyue\resources\" -Recurse -Force - # Copy-Item -Path ".\app\resource\" -Destination ".\dist\heiyue\app\resource\" -Recurse -Force - # Copy-Item -Path ".\README.md" -Destination ".\dist\heiyue\" -Force - # Copy-Item -Path ".\dist\updater\HeiYue Updater.exe" -Destination ".\dist\heiyue\HeiYue Updater.exe" -Recurse -Force + - name: Move assets to dist directory + run: | + Copy-Item -Path ".\actions\" -Destination ".\dist\heiyue\actions\" -Recurse -Force + Copy-Item -Path ".\resources\" -Destination ".\dist\heiyue\resources\" -Recurse -Force + Copy-Item -Path ".\app\resource\" -Destination ".\dist\heiyue\app\resource\" -Recurse -Force + Copy-Item -Path ".\README.md" -Destination ".\dist\heiyue\" -Force + Copy-Item -Path ".\dist\updater\HeiYue Updater.exe" -Destination ".\dist\heiyue\HeiYue Updater.exe" -Recurse -Force - name: Make increment zip id: make_increment_zip From f9aa1786e5507cce745d3828d2573fbb2e4ad32f Mon Sep 17 00:00:00 2001 From: Night-stars-1 Date: Wed, 12 Feb 2025 00:39:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E6=9B=B4=E6=94=B9=E5=A2=9E?= =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=96=B0=E5=8C=85=E7=9A=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- diff_folder.py | 4 ++-- updater.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/diff_folder.py b/diff_folder.py index 874e07d..3aed67b 100644 --- a/diff_folder.py +++ b/diff_folder.py @@ -125,5 +125,5 @@ def zip_files(differences, zip_filename, base_folder): differences, tag_name = compare_folders(target_folder) if tag_name: - print(f"increment_zip=Auto_Resonance_{tag_name}.zip") - zip_files(differences, f"Auto_Resonance_{tag_name}.zip", target_folder) + print(f"increment_zip=Auto_Resonance_Update_{tag_name}.zip") + zip_files(differences, f"Auto_Resonance_Update_{tag_name}.zip", target_folder) diff --git a/updater.py b/updater.py index 686f385..21f632f 100644 --- a/updater.py +++ b/updater.py @@ -1,7 +1,7 @@ """ Author: Night-stars-1 nujj1042633805@gmail.com Date: 2024-04-29 12:51:19 -LastEditTime: 2025-02-11 23:21:55 +LastEditTime: 2025-02-12 00:39:08 LastEditors: Night-stars-1 nujj1042633805@gmail.com """ @@ -147,7 +147,7 @@ async def get_update_status(self): ( asset for asset in result["assets"] - if asset["name"] == f"Auto_Resonance_{__version__}.zip" + if asset["name"] == f"Auto_Resonance_Update_{__version__}.zip" ), None, )