Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #102

Merged
merged 2 commits into from
Feb 11, 2025
Merged

Dev #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8279bae
ci: 支持增量更新
Night-stars-1 Feb 11, 2025
f9aa178
chore: 更改增量更新包的名称
Night-stars-1 Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions .github/workflows/build_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions diff_folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
"""

Expand Down Expand Up @@ -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,
)
Expand Down
Loading