mirror of
https://github.com/KenanZhu/AutoLibrary.git
synced 2026-06-18 07:23:03 +08:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 43b87db4eb | |||
| ae23f65e5a | |||
| a7b9c340ae | |||
| 96d733d2ed | |||
| 65cb951ada | |||
| 94ce3433a3 |
@@ -1,48 +1,58 @@
|
||||
name: Build and Release
|
||||
name: Build
|
||||
|
||||
# This workflow compiles the application for Windows platform using PyInstaller, and
|
||||
# archives the built artifacts as 'AutoLibrary.<tag_name>-windows-x86_64.zip'.
|
||||
#
|
||||
# It is triggered when called by the release workflow.
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v[0-9]+.[0-9]+.[0-9]+'
|
||||
workflow_call:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version number'
|
||||
required: true
|
||||
type: string
|
||||
tag_name:
|
||||
description: 'Tag name'
|
||||
required: true
|
||||
type: string
|
||||
outputs:
|
||||
version:
|
||||
description: 'The version number'
|
||||
value: ${{ jobs.build-windows.outputs.version }}
|
||||
tag_name:
|
||||
description: 'The tag name'
|
||||
value: ${{ jobs.build-windows.outputs.tag_name }}
|
||||
|
||||
#
|
||||
# Build Windows
|
||||
#
|
||||
|
||||
jobs:
|
||||
update-version-info:
|
||||
uses: ./.github/workflows/update-version-info.yml
|
||||
permissions:
|
||||
contents: write
|
||||
with:
|
||||
tag_name: ${{ github.ref_name }}
|
||||
ref: ${{ github.ref }}
|
||||
|
||||
commit-and-move-tag:
|
||||
needs: update-version-info
|
||||
if: ${{ needs.update-version-info.outputs.has_changes == 'true' }}
|
||||
uses: ./.github/workflows/commit-and-move-tag.yml
|
||||
permissions:
|
||||
contents: write
|
||||
with:
|
||||
tag_name: ${{ needs.update-version-info.outputs.tag_name }}
|
||||
version: ${{ needs.update-version-info.outputs.version }}
|
||||
file_path: src/gui/ALVersionInfo.py
|
||||
|
||||
build-and-release:
|
||||
build-windows:
|
||||
runs-on: windows-latest
|
||||
needs: [update-version-info, commit-and-move-tag]
|
||||
if: always() && needs.update-version-info.result == 'success'
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
outputs:
|
||||
version: ${{ steps.get_version.outputs.VERSION }}
|
||||
tag_name: ${{ steps.get_version.outputs.TAG_NAME }}
|
||||
steps:
|
||||
- name: Checkout code with updated version info
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
ref: main
|
||||
|
||||
- name: Get version info from previous job
|
||||
id: get_tag
|
||||
# here we download the build version of ALVersionInfo.py from artifacts
|
||||
# and replace the committed version
|
||||
- name: Download build version of ALVersionInfo.py
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: updated-version-info-for-build
|
||||
path: src/gui/
|
||||
|
||||
- name: Get version info
|
||||
id: get_version
|
||||
run: |
|
||||
$tagName = "${{ needs.update-version-info.outputs.tag_name }}"
|
||||
$version = "${{ needs.update-version-info.outputs.version }}"
|
||||
$version = "${{ inputs.version }}"
|
||||
$tagName = "${{ inputs.tag_name }}"
|
||||
|
||||
echo "TAG_NAME=$tagName" >> $env:GITHUB_OUTPUT
|
||||
echo "VERSION=$version" >> $env:GITHUB_OUTPUT
|
||||
@@ -50,17 +60,17 @@ jobs:
|
||||
Write-Host "✓ Version: $version"
|
||||
shell: pwsh
|
||||
|
||||
- name: Verify ALVersionInfo.py was updated
|
||||
- name: Verify 'ALVersionInfo.py' was updated
|
||||
run: |
|
||||
$versionInfoFile = "src/gui/ALVersionInfo.py"
|
||||
Write-Host "Verifying $versionInfoFile content:"
|
||||
Write-Host "================================"
|
||||
Write-Host "=================================="
|
||||
Get-Content $versionInfoFile | Write-Host
|
||||
Write-Host "================================"
|
||||
Write-Host "=================================="
|
||||
shell: pwsh
|
||||
|
||||
- name: Set up Python
|
||||
uses: actions/setup-python@v5
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.13'
|
||||
|
||||
@@ -69,7 +79,7 @@ jobs:
|
||||
python -m pip install --upgrade pip
|
||||
pip install -r requirement.txt
|
||||
|
||||
- name: Fix ddddocr compatibility and copy model files
|
||||
- name: Solve ddddocr compatibility and copy model files
|
||||
run: |
|
||||
$ddddocrPath = python -c "import ddddocr, os; print(os.path.dirname(ddddocr.__file__))"
|
||||
Write-Host "ddddocr package location: $ddddocrPath"
|
||||
@@ -121,9 +131,9 @@ jobs:
|
||||
./compile_rc.bat
|
||||
shell: cmd
|
||||
|
||||
- name: Generate Main.spec dynamically
|
||||
- name: Generate 'Main.spec'
|
||||
run: |
|
||||
$version = "${{ steps.get_tag.outputs.VERSION }}"
|
||||
$version = "${{ steps.get_version.outputs.VERSION }}"
|
||||
$exeName = "AutoLibrary-$version"
|
||||
|
||||
Write-Host "Generating Main.spec for version: $version"
|
||||
@@ -173,28 +183,29 @@ jobs:
|
||||
" icon=['src\\gui\\icons\\AutoLibrary_32x32.ico'],"
|
||||
")"
|
||||
)
|
||||
|
||||
$specLines | Out-File -FilePath "Main.spec" -Encoding UTF8
|
||||
|
||||
Write-Host "✓ Main.spec generated successfully"
|
||||
Write-Host "`n=== Generated Main.spec ==="
|
||||
Write-Host "`nGenerated Main.spec ============"
|
||||
Get-Content "Main.spec" | Write-Host
|
||||
Write-Host "==========================`n"
|
||||
Write-Host "==================================`n"
|
||||
shell: pwsh
|
||||
|
||||
- name: Build with PyInstaller
|
||||
run: |
|
||||
pyinstaller Main.spec
|
||||
|
||||
- name: Create Release Archive
|
||||
- name: Zip windows release
|
||||
id: zip_release
|
||||
run: |
|
||||
$tagName = "${{ steps.get_tag.outputs.TAG_NAME }}"
|
||||
$version = "${{ steps.get_tag.outputs.VERSION }}"
|
||||
$tagName = "${{ steps.get_version.outputs.TAG_NAME }}"
|
||||
$version = "${{ steps.get_version.outputs.VERSION }}"
|
||||
$exeName = "AutoLibrary-$version.exe"
|
||||
$zipName = "AutoLibrary.$tagName-windows-x86_64.zip"
|
||||
|
||||
Write-Host "Looking for executable: dist/$exeName"
|
||||
echo "ZIP_PATH=$zipName" >> $env:GITHUB_OUTPUT
|
||||
|
||||
Write-Host "Looking for executable: dist/$exeName"
|
||||
if (Test-Path "dist/$exeName") {
|
||||
Compress-Archive -Path "dist/$exeName" -DestinationPath $zipName
|
||||
Write-Host "✓ Created release archive: $zipName"
|
||||
@@ -206,31 +217,9 @@ jobs:
|
||||
}
|
||||
shell: pwsh
|
||||
|
||||
- name: Create Release
|
||||
id: create_release
|
||||
uses: softprops/action-gh-release@v2
|
||||
- name: Archive artifacts
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
tag_name: ${{ steps.get_tag.outputs.TAG_NAME }}
|
||||
name: AutoLibrary ${{ steps.get_tag.outputs.TAG_NAME }}
|
||||
files: |
|
||||
AutoLibrary.${{ steps.get_tag.outputs.TAG_NAME }}-windows-x86_64.zip
|
||||
draft: false
|
||||
prerelease: false
|
||||
generate_release_notes: true
|
||||
body: |
|
||||
### 下载获取
|
||||
- **Windows x86_64**: `AutoLibrary.${{ steps.get_tag.outputs.TAG_NAME }}-windows-x86_64.zip`
|
||||
|
||||
### 如何使用
|
||||
1. 下载 `AutoLibrary.${{ steps.get_tag.outputs.TAG_NAME }}-windows-x86_64.zip` 文件
|
||||
2. 解压到任意目录
|
||||
3. 下载对应浏览器的驱动文件
|
||||
4. 运行 `AutoLibrary-${{ steps.get_tag.outputs.VERSION }}.exe` (首次运行会初始化配置文件)
|
||||
5. 按照提示操作即可
|
||||
|
||||
更多详情请访问 [AutoLibrary 网站](http://autolibrary.cv) 和查看 [帮助手册](https://autolibrary.cv/docs/manual_lists.html)
|
||||
|
||||
---
|
||||
**完整更新日志见下方自动生成的 Release Notes**
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
name: AutoLibrary.${{ steps.get_version.outputs.TAG_NAME }}-windows-x86_64
|
||||
path: |
|
||||
${{ steps.zip_release.outputs.ZIP_PATH }}
|
||||
@@ -1,4 +1,9 @@
|
||||
name: Commit and Move Tag
|
||||
name: Commit Release
|
||||
|
||||
# This workflow commits version changes in 'ALVersionInfo.py' (get from artifacts) and
|
||||
# moves the release tag to this new release commit.
|
||||
#
|
||||
# It is triggered when called by the release workflow.
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
@@ -18,10 +23,10 @@ on:
|
||||
outputs:
|
||||
new_commit_sha:
|
||||
description: 'The new commit SHA after moving the tag'
|
||||
value: ${{ jobs.commit-and-move-tag.outputs.new_commit_sha }}
|
||||
value: ${{ jobs.commit-release.outputs.new_commit_sha }}
|
||||
|
||||
jobs:
|
||||
commit-and-move-tag:
|
||||
commit-release:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -35,10 +40,12 @@ jobs:
|
||||
ref: main
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Download modified file
|
||||
# here we download the commit version of ALVersionInfo.py from artifacts
|
||||
# and replace the original file with it.
|
||||
- name: Download commit version of ALVersionInfo.py
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: updated-version-info
|
||||
name: updated-version-info-for-commit
|
||||
path: downloaded-file/
|
||||
|
||||
- name: Replace file with updated version
|
||||
@@ -52,9 +59,9 @@ jobs:
|
||||
|
||||
echo "✓ File replaced: $FILE_PATH"
|
||||
echo ""
|
||||
echo "=== Updated file content ==="
|
||||
cat "$FILE_PATH"
|
||||
echo "============================"
|
||||
echo "Updated file content ==================="
|
||||
cat "$FILE_PATH"
|
||||
echo "========================================"
|
||||
|
||||
- name: Commit changes
|
||||
id: commit_changes
|
||||
@@ -85,7 +92,7 @@ jobs:
|
||||
git push origin HEAD:${MAIN_BRANCH}
|
||||
echo "✓ Changes pushed to ${MAIN_BRANCH}"
|
||||
|
||||
- name: Move tag to new commit
|
||||
- name: Move tag to new release commit
|
||||
run: |
|
||||
TAG_NAME="${{ inputs.tag_name }}"
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
name: Release
|
||||
|
||||
# This workflow automates the complete release process for AutoLibrary application
|
||||
# It is triggered when a new version tag (vX.Y.Z) is pushed to the repository
|
||||
#
|
||||
# Workflow Steps:
|
||||
# START >
|
||||
|
||||
# 1. Update Version:
|
||||
# Updates version information in 'ALVersionInfo.py' with build metadata and archives
|
||||
# the updated version file as an artifact.
|
||||
#
|
||||
# for more information, please refer to the comment in the workflow 'update-version.yml'
|
||||
|
||||
# 2. Commit Release:
|
||||
# Commits version changes and moves the release tag to this new release commit.
|
||||
|
||||
# 3. Build:
|
||||
# Compiles the application for Windows platform using PyInstaller, and
|
||||
# archives the built artifacts as 'AutoLibrary.<tag_name>-windows-x86_64.zip'.
|
||||
|
||||
# 4. Release:
|
||||
# Creates GitHub release with generated artifacts and release notes
|
||||
|
||||
# < END
|
||||
#
|
||||
# The workflow ensures version consistency between source code, built artifacts, and GitHub releases
|
||||
# while maintaining proper commit history and tag management.
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v[0-9]+.[0-9]+.[0-9]+'
|
||||
|
||||
jobs:
|
||||
#
|
||||
# Start :
|
||||
# virtual job that indacates the start of the release process
|
||||
#
|
||||
|
||||
start:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Start release
|
||||
run: |
|
||||
echo "✓ Starting release"
|
||||
|
||||
#
|
||||
# Update version :
|
||||
# this job updates the version in the file 'ALVersionInfo.py'
|
||||
#
|
||||
|
||||
update-version:
|
||||
needs:
|
||||
- start
|
||||
uses: ./.github/workflows/update-version.yml
|
||||
permissions:
|
||||
contents: write
|
||||
with:
|
||||
tag_name: ${{ github.ref_name }}
|
||||
ref: ${{ github.ref }}
|
||||
|
||||
#
|
||||
# Commit release :
|
||||
# this job commits the updated version file and move the release
|
||||
# tag to this new commit
|
||||
#
|
||||
|
||||
commit-release:
|
||||
needs:
|
||||
- update-version
|
||||
if: ${{ needs.update-version.outputs.has_changes == 'true' }}
|
||||
uses: ./.github/workflows/commit-release.yml
|
||||
permissions:
|
||||
contents: write
|
||||
with:
|
||||
tag_name: ${{ needs.update-version.outputs.tag_name }}
|
||||
version: ${{ needs.update-version.outputs.version }}
|
||||
file_path: src/gui/ALVersionInfo.py
|
||||
|
||||
#
|
||||
# Build :
|
||||
# this job builds the application artifacts and archives them
|
||||
|
||||
build:
|
||||
needs:
|
||||
- update-version
|
||||
- commit-release
|
||||
if: always() && needs.update-version.result == 'success' && needs.commit-release.result == 'success'
|
||||
uses: ./.github/workflows/build.yml
|
||||
permissions:
|
||||
contents: write
|
||||
with:
|
||||
version: ${{ needs.update-version.outputs.version }}
|
||||
tag_name: ${{ needs.update-version.outputs.tag_name }}
|
||||
|
||||
#
|
||||
# Release :
|
||||
# this job creates a GitHub release and uploads the archive files
|
||||
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- build
|
||||
if: always() && needs.build.result == 'success'
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
steps:
|
||||
- name: Download artifacts
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
name: AutoLibrary.${{ needs.build.outputs.tag_name }}-windows-x86_64
|
||||
path: artifacts/
|
||||
|
||||
- name: Create release
|
||||
id: create_release
|
||||
uses: softprops/action-gh-release@v2
|
||||
with:
|
||||
tag_name: ${{ needs.build.outputs.tag_name }}
|
||||
name: AutoLibrary ${{ needs.build.outputs.tag_name }}
|
||||
files: |
|
||||
artifacts/AutoLibrary.${{ needs.build.outputs.tag_name }}-windows-x86_64.zip
|
||||
draft: false
|
||||
prerelease: false
|
||||
generate_release_notes: true
|
||||
body: |
|
||||
### 下载获取
|
||||
- **Windows x86_64**: `AutoLibrary.${{ needs.build.outputs.tag_name }}-windows-x86_64.zip`
|
||||
|
||||
### 如何使用
|
||||
1. 下载 `AutoLibrary.${{ needs.build.outputs.tag_name }}-windows-x86_64.zip` 文件
|
||||
2. 解压到任意目录
|
||||
3. 下载对应浏览器的驱动文件
|
||||
4. 运行 `AutoLibrary-${{ needs.build.outputs.version }}.exe` (首次运行会初始化配置文件)
|
||||
5. 按照提示操作即可
|
||||
|
||||
更多详情请访问 [AutoLibrary 网站](http://autolibrary.cv) 和查看 [帮助手册](https://autolibrary.cv/docs/manual_lists.html)
|
||||
|
||||
---
|
||||
**完整更新日志见下方自动生成的 Release Notes**
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
# End :
|
||||
# virtual job that indacates the end of the release process
|
||||
#
|
||||
|
||||
end:
|
||||
needs:
|
||||
- release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: End release
|
||||
run: |
|
||||
echo "✓ Ending release"
|
||||
@@ -1,10 +1,18 @@
|
||||
name: Update Version Info
|
||||
name: Update Version
|
||||
|
||||
# This workflow updates version information in 'ALVersionInfo.py' with build metadata.
|
||||
# In progress, it will generate two version files, the first one is locate in 'src/gui/ALVersionInfo.py',
|
||||
# and the second one is locate in 'src/gui/temp/ALVersionInfo.py'. The first one is use
|
||||
# in the release process, it only update the version and tag name. The commit and build infomation
|
||||
# is 'local' or 'null'. All of them will finally archive as artifacts.
|
||||
#
|
||||
# It is triggered when called by the release workflow.
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
tag_name:
|
||||
description: 'Tag name (e.g., v1.0.0)'
|
||||
description: 'Tag name'
|
||||
required: true
|
||||
type: string
|
||||
ref:
|
||||
@@ -14,16 +22,16 @@ on:
|
||||
outputs:
|
||||
tag_name:
|
||||
description: 'The tag name'
|
||||
value: ${{ jobs.update-version-info.outputs.tag_name }}
|
||||
value: ${{ jobs.update-version.outputs.tag_name }}
|
||||
version:
|
||||
description: 'The version number'
|
||||
value: ${{ jobs.update-version-info.outputs.version }}
|
||||
value: ${{ jobs.update-version.outputs.version }}
|
||||
has_changes:
|
||||
description: 'Whether ALVersionInfo.py was modified'
|
||||
value: ${{ jobs.update-version-info.outputs.has_changes }}
|
||||
value: ${{ jobs.update-version.outputs.has_changes }}
|
||||
|
||||
jobs:
|
||||
update-version-info:
|
||||
update-version:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
@@ -59,24 +67,30 @@ jobs:
|
||||
echo "✓ Commit SHA: $COMMIT_SHA"
|
||||
echo "✓ Commit Date: $COMMIT_DATE"
|
||||
|
||||
- name: Create 'temp' directory
|
||||
run: |
|
||||
echo "Creating temp directory..."
|
||||
mkdir -p "src/gui/temp"
|
||||
echo "✓ temp directory created successfully"
|
||||
|
||||
- name: Update ALVersionInfo.py with version info
|
||||
run: |
|
||||
VERSION="${{ steps.get_version.outputs.VERSION }}"
|
||||
TAG_NAME="${{ steps.get_version.outputs.TAG_NAME }}"
|
||||
COMMIT_SHA="${{ steps.get_version.outputs.COMMIT_SHA }}"
|
||||
COMMIT_DATE="${{ steps.get_version.outputs.COMMIT_DATE }}"
|
||||
APP_INFO_FILE="src/gui/ALVersionInfo.py"
|
||||
VER_INFO_BUILDFILE="src/gui/temp/ALVersionInfo.py"
|
||||
VER_INFO_COMMITFILE="src/gui/ALVersionInfo.py"
|
||||
BUILD_DATE=$(date -u '+%Y-%m-%d %H:%M:%S UTC')
|
||||
|
||||
echo "Updating $APP_INFO_FILE with build information..."
|
||||
|
||||
echo "Updating ALVersionInfo.py files with build information..."
|
||||
{
|
||||
echo '# -*- coding: utf-8 -*-'
|
||||
echo ''
|
||||
echo '"""'
|
||||
echo ' The contents of this file will automatically be updated by the'
|
||||
echo ' workflow process. Do not edit manually.'
|
||||
echo ' '
|
||||
echo ''
|
||||
echo ' This file is auto-generated during the workflow process.'
|
||||
echo " Last updated: ${BUILD_DATE}"
|
||||
echo '"""'
|
||||
@@ -87,13 +101,39 @@ jobs:
|
||||
echo "AL_COMMIT_DATE = \"${COMMIT_DATE}\" # time zone : UTC"
|
||||
echo "AL_BUILD_DATE = \"${BUILD_DATE}\" # time zone : UTC"
|
||||
echo 'AL_VERSION_FULL = f"{AL_VERSION} ({AL_COMMIT_SHA})"'
|
||||
} > "$APP_INFO_FILE"
|
||||
} > "$VER_INFO_BUILDFILE"
|
||||
|
||||
echo "✓ ALVersionInfo.py updated successfully"
|
||||
echo "Updating ALVersionInfo.py for release commit..."
|
||||
{
|
||||
echo '# -*- coding: utf-8 -*-'
|
||||
echo ''
|
||||
echo '"""'
|
||||
echo ' The contents of this file will automatically be updated by the'
|
||||
echo ' workflow process. Do not edit manually.'
|
||||
echo ''
|
||||
echo ' This file is auto-generated during the workflow process.'
|
||||
echo " Last updated: ${BUILD_DATE}"
|
||||
echo '"""'
|
||||
echo ''
|
||||
echo "AL_VERSION = \"${VERSION}\""
|
||||
echo "AL_TAG = \"${TAG_NAME}\""
|
||||
echo "AL_COMMIT_SHA = \"local\""
|
||||
echo "AL_COMMIT_DATE = \"null\" # time zone : UTC"
|
||||
echo "AL_BUILD_DATE = \"null\" # time zone : UTC"
|
||||
echo 'AL_VERSION_FULL = f"{AL_VERSION} ({AL_COMMIT_SHA})"'
|
||||
} > "$VER_INFO_COMMITFILE"
|
||||
|
||||
echo "✓ ALVersionInfo.py files updated successfully"
|
||||
echo ""
|
||||
echo "=== Updated ALVersionInfo.py ==="
|
||||
cat "$APP_INFO_FILE"
|
||||
echo "=========================="
|
||||
echo "Build version file location: $VER_INFO_BUILDFILE"
|
||||
echo "Commit version file location: $VER_INFO_COMMITFILE"
|
||||
echo ""
|
||||
echo "Build version ALVersionInfo.py content ="
|
||||
cat "$VER_INFO_BUILDFILE"
|
||||
echo ""
|
||||
echo "Commit version ALVersionInfo.py content "
|
||||
cat "$VER_INFO_COMMITFILE"
|
||||
echo "========================================"
|
||||
|
||||
- name: Check if ALVersionInfo.py was modified
|
||||
id: check_changes
|
||||
@@ -106,10 +146,18 @@ jobs:
|
||||
echo "✓ ALVersionInfo.py has been modified"
|
||||
fi
|
||||
|
||||
- name: Upload modified ALVersionInfo.py
|
||||
- name: Upload modified ALVersionInfo.py ready for build
|
||||
if: steps.check_changes.outputs.has_changes == 'true'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: updated-version-info
|
||||
path: src/gui/ALVersionInfo.py
|
||||
name: updated-version-info-for-build
|
||||
path: src/gui/temp/ALVersionInfo.py
|
||||
retention-days: 1
|
||||
|
||||
- name: Upload modified ALVersionInfo.py ready for commit
|
||||
if: steps.check_changes.outputs.has_changes == 'true'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: updated-version-info-for-commit
|
||||
path: src/gui/ALVersionInfo.py
|
||||
retention-days: 1
|
||||
@@ -264,7 +264,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
||||
},
|
||||
"web_driver": {
|
||||
"driver_type": "edge",
|
||||
"driver_path": "msedgedriver.exe",
|
||||
"driver_path": "",
|
||||
"headless": False
|
||||
},
|
||||
"mode": {
|
||||
@@ -334,7 +334,10 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget):
|
||||
self.AutoCaptchaCheckBox.setChecked(run_config["login"]["auto_captcha"])
|
||||
self.LoginAttemptSpinBox.setValue(run_config["login"]["max_attempt"])
|
||||
self.BrowserTypeComboBox.setCurrentText(run_config["web_driver"]["driver_type"])
|
||||
driver_path = os.path.abspath(run_config["web_driver"]["driver_path"])
|
||||
if run_config["web_driver"]["driver_path"]:
|
||||
driver_path = os.path.abspath(run_config["web_driver"]["driver_path"])
|
||||
else:
|
||||
driver_path = ""
|
||||
self.BrowseBrowserDriverEdit.setText(QDir.toNativeSeparators(driver_path))
|
||||
self.HeadlessCheckBox.setChecked(run_config["web_driver"]["headless"])
|
||||
run_mode = run_config["mode"]["run_mode"]
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
</property>
|
||||
<widget class="QWidget" name="UserConfigWidget">
|
||||
<attribute name="title">
|
||||
<string>用户设置</string>
|
||||
<string>用户配置</string>
|
||||
</attribute>
|
||||
<layout class="QHBoxLayout" name="UserConfigWidgetLayout">
|
||||
<property name="spacing">
|
||||
@@ -1107,7 +1107,7 @@
|
||||
</widget>
|
||||
<widget class="QWidget" name="RunConfigWidget">
|
||||
<attribute name="title">
|
||||
<string>运行设置</string>
|
||||
<string>运行配置</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="SystemConfigWidgetLayout">
|
||||
<property name="leftMargin">
|
||||
@@ -1730,7 +1730,7 @@
|
||||
</size>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>;;;</string>
|
||||
<string>...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -3,14 +3,14 @@
|
||||
"""
|
||||
The contents of this file will automatically be updated by the
|
||||
workflow process. Do not edit manually.
|
||||
|
||||
|
||||
This file is auto-generated during the workflow process.
|
||||
Last updated: 2026-01-02 16:38:53 UTC
|
||||
Last updated: 2026-01-05 04:04:54 UTC
|
||||
"""
|
||||
|
||||
AL_VERSION = "1.0.1"
|
||||
AL_TAG = "v1.0.1"
|
||||
AL_COMMIT_SHA = "924db3b"
|
||||
AL_COMMIT_DATE = "2026-01-02 16:35:16 UTC" # time zone : UTC
|
||||
AL_BUILD_DATE = "2026-01-02 16:38:53 UTC" # time zone : UTC
|
||||
AL_VERSION = "1.0.2"
|
||||
AL_TAG = "v1.0.2"
|
||||
AL_COMMIT_SHA = "local"
|
||||
AL_COMMIT_DATE = "null" # time zone : UTC
|
||||
AL_BUILD_DATE = "null" # time zone : UTC
|
||||
AL_VERSION_FULL = f"{AL_VERSION} ({AL_COMMIT_SHA})"
|
||||
|
||||
+53
-28
@@ -14,7 +14,9 @@ from selenium import webdriver
|
||||
from selenium.webdriver.common.by import By
|
||||
from selenium.webdriver.support.ui import WebDriverWait
|
||||
from selenium.webdriver.support import expected_conditions as EC
|
||||
from selenium.webdriver.edge.service import Service
|
||||
from selenium.webdriver.edge.service import Service as EdgeService
|
||||
from selenium.webdriver.chrome.service import Service as ChromeService
|
||||
from selenium.webdriver.firefox.service import Service as FirefoxService
|
||||
|
||||
from base.MsgBase import MsgBase
|
||||
from operators.LibChecker import LibChecker
|
||||
@@ -53,54 +55,75 @@ class AutoLib(MsgBase):
|
||||
) -> bool:
|
||||
|
||||
self._showTrace("正在初始化浏览器驱动......")
|
||||
edge_options = webdriver.EdgeOptions()
|
||||
|
||||
web_driver_config = self.__run_config.get("web_driver", None)
|
||||
self.__driver_type = web_driver_config.get("driver_type")
|
||||
match self.__driver_type.lower():
|
||||
case "edge":
|
||||
driver_options = webdriver.EdgeOptions()
|
||||
case "chrome":
|
||||
driver_options = webdriver.ChromeOptions()
|
||||
case "firefox":
|
||||
driver_options = webdriver.FirefoxOptions()
|
||||
case _:
|
||||
raise Exception(f"不支持的浏览器驱动类型: {self.__driver_type} !")
|
||||
|
||||
if not web_driver_config:
|
||||
self._showTrace("未配置浏览器驱动参数 !")
|
||||
return False
|
||||
if web_driver_config.get("headless"):
|
||||
edge_options.add_argument("--headless")
|
||||
edge_options.add_argument("--disable-gpu")
|
||||
edge_options.add_argument("--no-sandbox")
|
||||
edge_options.add_argument("--disable-dev-shm-usage")
|
||||
driver_options.add_argument("--headless")
|
||||
driver_options.add_argument("--disable-gpu")
|
||||
driver_options.add_argument("--no-sandbox")
|
||||
driver_options.add_argument("--disable-dev-shm-usage")
|
||||
|
||||
# must be 1920x1080, otherwise the page will cause some elements not accessible
|
||||
edge_options.add_argument("--window-size=1920,1080")
|
||||
edge_options.add_argument("--remote-allow-origins=*")
|
||||
driver_options.add_argument("--window-size=1920,1080")
|
||||
|
||||
# omit ssl errors and verbose log level
|
||||
edge_options.add_argument("--ignore-certificate-errors")
|
||||
edge_options.add_argument("--ignore-ssl-errors")
|
||||
edge_options.add_argument("--log-level=OFF")
|
||||
edge_options.add_argument("--silent")
|
||||
driver_options.add_argument("--ignore-certificate-errors")
|
||||
driver_options.add_argument("--ignore-ssl-errors")
|
||||
driver_options.add_argument("--log-level=OFF")
|
||||
driver_options.add_argument("--silent")
|
||||
|
||||
edge_options.add_experimental_option("excludeSwitches", ["enable-automation"])
|
||||
edge_options.add_experimental_option("useAutomationExtension", False)
|
||||
edge_options.add_argument("--disable-blink-features=AutomationControlled")
|
||||
edge_options.add_argument(
|
||||
"--user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) "\
|
||||
"AppleWebKit/537.36 (KHTML, like Gecko) "\
|
||||
"Chrome/120.0.0.0 "\
|
||||
"Safari/537.36 "\
|
||||
"Edg/120.0.0.0"
|
||||
)
|
||||
# set options for chrome and edge
|
||||
if self.__driver_type.lower() in ["edge", "chrome"]:
|
||||
driver_options.add_argument("--remote-allow-origins=*")
|
||||
driver_options.add_experimental_option("excludeSwitches", ["enable-automation"])
|
||||
driver_options.add_experimental_option("useAutomationExtension", False)
|
||||
driver_options.add_argument("--disable-blink-features=AutomationControlled")
|
||||
user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "\
|
||||
"AppleWebKit/537.36 (KHTML, like Gecko) "\
|
||||
"Chrome/120.0.0.0 "\
|
||||
"Safari/537.36"
|
||||
if self.__driver_type.lower() == "edge":
|
||||
user_agent += " Edg/120.0.0.0"
|
||||
# set options for firefox
|
||||
elif self.__driver_type.lower() == "firefox":
|
||||
driver_options.set_preference("dom.webdriver.enabled", False)
|
||||
driver_options.set_preference("useAutomationExtension", False)
|
||||
user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:120.0) "\
|
||||
"Gecko/20100101 Firefox/120.0"
|
||||
driver_options.add_argument(f"user-agent={user_agent}")
|
||||
|
||||
# init browser driver
|
||||
self.__driver_path = web_driver_config.get("driver_path")
|
||||
self.__driver_type = web_driver_config.get("driver_type")
|
||||
if not self.__driver_path:
|
||||
raise Exception(f"未配置浏览器驱动路径 !")
|
||||
self.__driver_path = os.path.abspath(self.__driver_path)
|
||||
try:
|
||||
service = None
|
||||
if self.__driver_path:
|
||||
service = Service(executable_path=self.__driver_path)
|
||||
match self.__driver_type.lower():
|
||||
case "edge":
|
||||
self.__driver = webdriver.Edge(service=service, options=edge_options)
|
||||
service = EdgeService(executable_path=self.__driver_path)
|
||||
self.__driver = webdriver.Edge(service=service, options=driver_options)
|
||||
case "chrome":
|
||||
self.__driver = webdriver.Chrome(service=service, options=edge_options)
|
||||
service = ChromeService(executable_path=self.__driver_path)
|
||||
self.__driver = webdriver.Chrome(service=service, options=driver_options)
|
||||
case "firefox":
|
||||
self.__driver = webdriver.Firefox(service=service, options=edge_options)
|
||||
self._showTrace(f"Firefox 浏览器驱动初始化略慢, 请耐心等待...")
|
||||
service = FirefoxService(executable_path=self.__driver_path)
|
||||
self.__driver = webdriver.Firefox(service=service, options=driver_options)
|
||||
case _:
|
||||
raise Exception(f"不支持的浏览器驱动类型: {self.__driver_type}")
|
||||
self.__driver.implicitly_wait(1)
|
||||
@@ -294,6 +317,8 @@ class AutoLib(MsgBase):
|
||||
) -> bool:
|
||||
|
||||
if self.__driver:
|
||||
if self.__driver_type.lower() == "firefox":
|
||||
self._showTrace(f"Firefox 浏览器驱动关闭略慢, 请耐心等待...")
|
||||
self.__driver.quit()
|
||||
self.__driver = None
|
||||
self._showTrace(f"浏览器驱动已关闭")
|
||||
|
||||
Reference in New Issue
Block a user