KenanZhu/AutoLibrary
1
1
Fork 0
mirror of https://github.com/KenanZhu/AutoLibrary.git synced 2026-06-17 23:13:03 +08:00
Code Issues Projects Activity

fix(workflows): 修复图标引用、条件逻辑死代码并统一输出格式

Browse Source 
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
KenanZhu
2026-05-28 02:49:46 +08:00
parent b78fd2d1e4
commit 59c06b3a19
5 changed files with 62 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-test.yml
+12 -12
View File
@@ -4,10 +4,6 @@ name: Build Test
# It is triggered when a pull request is opened, synchronized, or reopened against the main branch. # It is triggered when a pull request is opened, synchronized, or reopened against the main branch.
on: on:
push:
branches:
- main
pull_request: pull_request:
branches: branches:
- main - main
@@ -15,7 +11,6 @@ on:
- opened - opened
- synchronize - synchronize
- reopened - reopened
# Allow manual trigger for testing
workflow_dispatch: workflow_dispatch:
# #
@@ -49,6 +44,8 @@ jobs:
uses: actions/setup-python@v6 uses: actions/setup-python@v6
with: with:
python-version: '3.13' python-version: '3.13'
cache: 'pip'
cache-dependency-path: requirement.txt
- name: Install dependencies - name: Install dependencies
run: | run: |
@@ -125,7 +122,7 @@ jobs:
" binaries=[]," " binaries=[],"
" datas=[" " datas=["
" ('models\\common.onnx', 'ddddocr')," " ('models\\common.onnx', 'ddddocr'),"
" ('src\\gui\\resources\\icons\\AutoLibrary_32x32.ico', 'gui\\resources\\icons')," " ('src\\gui\\resources\\icons\\AutoLibrary_Logo_64.ico', 'gui\\resources\\icons'),"
" ]," " ],"
" hiddenimports=[]," " hiddenimports=[],"
" hookspath=[]," " hookspath=[],"
@@ -153,7 +150,7 @@ jobs:
" target_arch=None," " target_arch=None,"
" codesign_identity=None," " codesign_identity=None,"
" entitlements_file=None," " entitlements_file=None,"
" icon=['src\\gui\\resources\\icons\\AutoLibrary_32x32.ico']," " icon=['src\\gui\\resources\\icons\\AutoLibrary_Logo_64.ico'],"
")" ")"
"" ""
"coll = COLLECT(" "coll = COLLECT("
@@ -169,9 +166,11 @@ jobs:
$specLines | Out-File -FilePath "Main.spec" -Encoding UTF8 $specLines | Out-File -FilePath "Main.spec" -Encoding UTF8
Write-Host "✓ Main.spec (non-single file) generated successfully" Write-Host "✓ Main.spec (non-single file) generated successfully"
Write-Host "`nGenerated Main.spec ============" Write-Host "`n========================================"
Write-Host "Generated Main.spec"
Write-Host "========================================"
Get-Content "Main.spec" | Write-Host Get-Content "Main.spec" | Write-Host
Write-Host "==================================`n" Write-Host "========================================`n"
shell: pwsh shell: pwsh
- name: Build with PyInstaller - name: Build with PyInstaller
@@ -186,7 +185,7 @@ jobs:
$distDir = "dist/AutoLibrary-$version" $distDir = "dist/AutoLibrary-$version"
$zipName = "AutoLibrary.$tagName-windows-x86_64.zip" $zipName = "AutoLibrary.$tagName-windows-x86_64.zip"
echo "ZIP_NAME=$zipName" >> $env:GITHUB_OUTPUT "ZIP_NAME=$zipName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
Write-Host "Looking for distribution directory: $distDir" Write-Host "Looking for distribution directory: $distDir"
if (Test-Path $distDir) { if (Test-Path $distDir) {
@@ -212,10 +211,11 @@ jobs:
run: | run: |
Write-Host "## Build Test Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 Write-Host "## Build Test Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
Write-Host "" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "========================================" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "✓ Pull request build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "✓ Pull request build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "- Pull Request #${{ github.event.pull_request.number }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "- Pull Request #${{ github.event.pull_request.number || 'N/A' }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "- Branch: ${{ github.event.pull_request.head.ref }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "- Branch: ${{ github.event.pull_request.head.ref || github.ref }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "- Event: ${{ github.event_name }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "- Event: ${{ github.event_name }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
shell: pwsh shell: pwsh
.github/workflows/build.yml
+14 -9
View File
@@ -76,15 +76,17 @@ jobs:
run: | run: |
$versionInfoFile = "src/gui/ALVersionInfo.py" $versionInfoFile = "src/gui/ALVersionInfo.py"
Write-Host "Verifying $versionInfoFile content:" Write-Host "Verifying $versionInfoFile content:"
Write-Host "==================================" Write-Host "========================================"
Get-Content $versionInfoFile | Write-Host Get-Content $versionInfoFile | Write-Host
Write-Host "==================================" Write-Host "========================================"
shell: pwsh shell: pwsh
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v6 uses: actions/setup-python@v6
with: with:
python-version: '3.13' python-version: '3.13'
cache: 'pip'
cache-dependency-path: requirement.txt
- name: Install dependencies - name: Install dependencies
run: | run: |
@@ -161,7 +163,7 @@ jobs:
" binaries=[]," " binaries=[],"
" datas=[" " datas=["
" ('models\\common.onnx', 'ddddocr')," " ('models\\common.onnx', 'ddddocr'),"
" ('src\\gui\\resources\\icons\\AutoLibrary_32x32.ico', 'gui\\resources\\icons')," " ('src\\gui\\resources\\icons\\AutoLibrary_Logo_64.ico', 'gui\\resources\\icons'),"
" ]," " ],"
" hiddenimports=[]," " hiddenimports=[],"
" hookspath=[]," " hookspath=[],"
@@ -189,7 +191,7 @@ jobs:
" target_arch=None," " target_arch=None,"
" codesign_identity=None," " codesign_identity=None,"
" entitlements_file=None," " entitlements_file=None,"
" icon=['src\\gui\\resources\\icons\\AutoLibrary_32x32.ico']," " icon=['src\\gui\\resources\\icons\\AutoLibrary_Logo_64.ico'],"
")" ")"
"" ""
"coll = COLLECT(" "coll = COLLECT("
@@ -205,9 +207,11 @@ jobs:
$specLines | Out-File -FilePath "Main.spec" -Encoding UTF8 $specLines | Out-File -FilePath "Main.spec" -Encoding UTF8
Write-Host "✓ Main.spec (non-single file) generated successfully" Write-Host "✓ Main.spec (non-single file) generated successfully"
Write-Host "`nGenerated Main.spec ============" Write-Host "`n========================================"
Write-Host "Generated Main.spec"
Write-Host "========================================"
Get-Content "Main.spec" | Write-Host Get-Content "Main.spec" | Write-Host
Write-Host "==================================`n" Write-Host "========================================`n"
shell: pwsh shell: pwsh
- name: Build with PyInstaller - name: Build with PyInstaller
@@ -222,7 +226,7 @@ jobs:
$distDir = "dist/AutoLibrary-$version" $distDir = "dist/AutoLibrary-$version"
$zipName = "AutoLibrary.$tagName-windows-x86_64.zip" $zipName = "AutoLibrary.$tagName-windows-x86_64.zip"
echo "ZIP_NAME=$zipName" >> $env:GITHUB_OUTPUT "ZIP_NAME=$zipName" | Out-File -FilePath $env:GITHUB_OUTPUT -Encoding utf8 -Append
Write-Host "Looking for distribution directory: $distDir" Write-Host "Looking for distribution directory: $distDir"
if (Test-Path $distDir) { if (Test-Path $distDir) {
@@ -242,13 +246,14 @@ jobs:
name: AutoLibrary.${{ steps.get_version.outputs.TAG_NAME }}-windows-x86_64 name: AutoLibrary.${{ steps.get_version.outputs.TAG_NAME }}-windows-x86_64
path: | path: |
${{ steps.zip_release.outputs.ZIP_NAME }} ${{ steps.zip_release.outputs.ZIP_NAME }}
retention-days: ${{ github.event_name != 'workflow_call' && 7 || 90 }} retention-days: ${{ inputs.is_test == 'true' && 7 || 90 }}
- name: Upload build summary - name: Upload build summary
if: ${{ github.event_name != 'workflow_call' }} if: ${{ inputs.is_test == 'true' }}
run: | run: |
Write-Host "## Build Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 Write-Host "## Build Summary" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8
Write-Host "" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "========================================" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "✓ Build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "✓ Build test completed successfully!" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "- Version: ${{ steps.get_version.outputs.VERSION }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
Write-Host "- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append Write-Host "- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8 -Append
.github/workflows/commit-release.yml
+9 -1
View File
@@ -83,7 +83,9 @@ jobs:
echo "✓ File replaced: $FILE_PATH" echo "✓ File replaced: $FILE_PATH"
echo "" echo ""
echo "Updated file content ===================" echo "========================================"
echo "Updated file content"
echo "========================================"
cat "$FILE_PATH" cat "$FILE_PATH"
echo "========================================" echo "========================================"
@@ -151,3 +153,9 @@ jobs:
COMMIT_SHA=$(git rev-parse --short HEAD) COMMIT_SHA=$(git rev-parse --short HEAD)
echo "commit_sha=$COMMIT_SHA" >> $GITHUB_OUTPUT echo "commit_sha=$COMMIT_SHA" >> $GITHUB_OUTPUT
echo "✓ New commit SHA: $COMMIT_SHA" echo "✓ New commit SHA: $COMMIT_SHA"
echo "## Commit Release Summary" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "========================================" >> $GITHUB_STEP_SUMMARY
echo "- Version: ${{ inputs.version }}" >> $GITHUB_STEP_SUMMARY
echo "- Tag: ${{ inputs.tag_name }}" >> $GITHUB_STEP_SUMMARY
echo "- Commit SHA: $COMMIT_SHA" >> $GITHUB_STEP_SUMMARY
.github/workflows/release.yml
+14 -7
View File
@@ -47,7 +47,7 @@ on:
jobs: jobs:
# #
# Start : # Start :
# virtual job that indacates the start of the release process # virtual job that indicates the start of the release process
# #
start: start:
@@ -158,7 +158,7 @@ jobs:
needs: needs:
- update-version - update-version
- commit-release - commit-release
if: always() && needs.update-version.result == 'success' && needs.commit-release.result == 'success' if: always() && needs.update-version.result == 'success' && (needs.commit-release.result == 'success' || needs.commit-release.result == 'skipped')
uses: ./.github/workflows/build.yml uses: ./.github/workflows/build.yml
permissions: permissions:
contents: write contents: write
@@ -205,7 +205,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# End : # End :
# virtual job that indacates the end of the release process # virtual job that indicates the end of the release process
# #
end: end:
@@ -227,7 +227,7 @@ jobs:
- release - release
- extract-version - extract-version
- commit-release - commit-release
if: ${{ needs.release.result == 'success' && needs.commit-release.result == 'success' }} if: ${{ needs.release.result == 'success' && (needs.commit-release.result == 'success' || needs.commit-release.result == 'skipped') }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
contents: write contents: write
@@ -267,9 +267,13 @@ jobs:
git checkout ${MAIN_BRANCH} git checkout ${MAIN_BRANCH}
# Show branch status before merge # Show branch status before merge
echo "=== Branch status before merge ===" echo "========================================"
echo "Branch status before merge"
echo "========================================"
git log --oneline --graph --all -5 git log --oneline --graph --all -5
echo "=== Diff between ${MAIN_BRANCH} and origin/${BRANCH_NAME} ===" echo "========================================"
echo "Diff: ${MAIN_BRANCH} vs origin/${BRANCH_NAME}"
echo "========================================"
git diff ${MAIN_BRANCH} origin/${BRANCH_NAME} --stat || echo "No differences found" git diff ${MAIN_BRANCH} origin/${BRANCH_NAME} --stat || echo "No differences found"
# Force create a merge commit even if there are no changes # Force create a merge commit even if there are no changes
@@ -279,7 +283,9 @@ jobs:
-m "chore(release): merge ${BRANCH_NAME} to ${MAIN_BRANCH} [auto release commit]" -m "chore(release): merge ${BRANCH_NAME} to ${MAIN_BRANCH} [auto release commit]"
# Show merge result # Show merge result
echo "=== Merge result ===" echo "========================================"
echo "Merge result"
echo "========================================"
git log --oneline --graph -3 git log --oneline --graph -3
# Push to main # Push to main
@@ -310,6 +316,7 @@ jobs:
echo "## Release Cleanup Summary" >> $GITHUB_STEP_SUMMARY echo "## Release Cleanup Summary" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY
echo "========================================" >> $GITHUB_STEP_SUMMARY
echo "✓ Release completed successfully!" >> $GITHUB_STEP_SUMMARY echo "✓ Release completed successfully!" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY
echo "### Actions Performed:" >> $GITHUB_STEP_SUMMARY echo "### Actions Performed:" >> $GITHUB_STEP_SUMMARY
.github/workflows/update-version.yml
+13 -3
View File
@@ -128,10 +128,15 @@ jobs:
echo "Build version file location: $VER_INFO_BUILDFILE" echo "Build version file location: $VER_INFO_BUILDFILE"
echo "Commit version file location: $VER_INFO_COMMITFILE" echo "Commit version file location: $VER_INFO_COMMITFILE"
echo "" echo ""
echo "Build version ALVersionInfo.py content =" echo "========================================"
echo "Build version ALVersionInfo.py"
echo "========================================"
cat "$VER_INFO_BUILDFILE" cat "$VER_INFO_BUILDFILE"
echo "========================================"
echo "" echo ""
echo "Commit version ALVersionInfo.py content " echo "========================================"
echo "Commit version ALVersionInfo.py"
echo "========================================"
cat "$VER_INFO_COMMITFILE" cat "$VER_INFO_COMMITFILE"
echo "========================================" echo "========================================"
@@ -140,11 +145,16 @@ jobs:
run: | run: |
if git diff --quiet src/gui/ALVersionInfo.py; then if git diff --quiet src/gui/ALVersionInfo.py; then
echo "has_changes=false" >> $GITHUB_OUTPUT echo "has_changes=false" >> $GITHUB_OUTPUT
echo "! No changes detected in ALVersionInfo.py" echo "⚠ No changes detected in ALVersionInfo.py"
else else
echo "has_changes=true" >> $GITHUB_OUTPUT echo "has_changes=true" >> $GITHUB_OUTPUT
echo "✓ ALVersionInfo.py has been modified" echo "✓ ALVersionInfo.py has been modified"
fi fi
echo "## Update Version Summary" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "========================================" >> $GITHUB_STEP_SUMMARY
echo "- Version: ${{ steps.get_version.outputs.VERSION }}" >> $GITHUB_STEP_SUMMARY
echo "- Tag: ${{ steps.get_version.outputs.TAG_NAME }}" >> $GITHUB_STEP_SUMMARY
- name: Upload modified ALVersionInfo.py ready for build - name: Upload modified ALVersionInfo.py ready for build
if: steps.check_changes.outputs.has_changes == 'true' if: steps.check_changes.outputs.has_changes == 'true'