[patch] PDD登录状态GUI回调优化
This commit is contained in:
@@ -9,33 +9,32 @@ jobs:
|
|||||||
runs-on: windows
|
runs-on: windows
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
# Step 1: Gitea 原生检出(不依赖 GitHub)
|
# Step 1: Checkout repository
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
shell: powershell
|
shell: powershell
|
||||||
run: |
|
run: |
|
||||||
Write-Host "=========================================="
|
Write-Host "==========================================";
|
||||||
Write-Host "开始检出代码"
|
Write-Host "Checking out repository";
|
||||||
Write-Host "=========================================="
|
Write-Host "==========================================";
|
||||||
Write-Host "当前目录: $(Get-Location)"
|
Write-Host "Current directory: $(Get-Location)";
|
||||||
Write-Host "分支: ${{ github.ref_name }}"
|
Write-Host "Branch: ${{ github.ref_name }}";
|
||||||
Write-Host "提交: ${{ github.sha }}"
|
Write-Host "Commit: ${{ github.sha }}";
|
||||||
Write-Host "作者: ${{ github.actor }}"
|
Write-Host "Author: ${{ github.actor }}";
|
||||||
Write-Host ""
|
Write-Host "";
|
||||||
|
|
||||||
# Git 配置
|
git config --global core.autocrlf false;
|
||||||
git config --global core.autocrlf false
|
git config --global core.longpaths true;
|
||||||
git config --global core.longpaths true
|
|
||||||
|
|
||||||
# 拉取最新代码
|
Write-Host "Fetching latest code...";
|
||||||
Write-Host "拉取最新代码..."
|
git fetch origin;
|
||||||
git fetch origin
|
git checkout ${{ github.ref_name }};
|
||||||
git checkout ${{ github.ref_name }}
|
git pull origin ${{ github.ref_name }};
|
||||||
git pull origin ${{ github.ref_name }}
|
|
||||||
|
|
||||||
Write-Host ""
|
Write-Host "";
|
||||||
Write-Host "Git 状态:"
|
Write-Host "Git status:";
|
||||||
git status
|
git status;
|
||||||
Write-Host "=========================================="
|
Write-Host "==========================================";
|
||||||
|
|
||||||
|
|
||||||
# Step 2: Check Python environment
|
# Step 2: Check Python environment
|
||||||
- name: Check Python environment
|
- name: Check Python environment
|
||||||
@@ -125,64 +124,43 @@ jobs:
|
|||||||
DB_PASSWORD: password_ee2iQ3
|
DB_PASSWORD: password_ee2iQ3
|
||||||
DB_PORT: 5400
|
DB_PORT: 5400
|
||||||
|
|
||||||
# Step 5: Commit changes back to repository
|
# Step 5: Commit version changes
|
||||||
- name: Commit version changes
|
- name: Commit version changes
|
||||||
if: success()
|
if: success()
|
||||||
shell: powershell
|
shell: powershell
|
||||||
run: |
|
run: |
|
||||||
Write-Host "Committing version changes..."
|
Write-Host "Committing version changes...";
|
||||||
|
|
||||||
# Read version from config.py
|
$VERSION = "";
|
||||||
$VERSION = ""
|
|
||||||
if (Test-Path "config.py") {
|
if (Test-Path "config.py") {
|
||||||
$configContent = Get-Content "config.py" -Raw
|
$configContent = Get-Content "config.py" -Raw;
|
||||||
if ($configContent -match 'APP_VERSION\s*=\s*"([\d.]+)"') {
|
if ($configContent -match 'APP_VERSION\s*=\s*"([\d.]+)"') {
|
||||||
$VERSION = $matches[1]
|
$VERSION = $matches[1];
|
||||||
Write-Host "New version: $VERSION"
|
Write-Host "New version: $VERSION";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# 配置 Git 用户(自动化提交)
|
git config user.name "Gitea Actions Bot";
|
||||||
git config user.name "Gitea Actions Bot"
|
git config user.email "bot@gitea.local";
|
||||||
git config user.email "bot@gitea.local"
|
|
||||||
|
|
||||||
# 检查文件状态
|
Write-Host "Adding files...";
|
||||||
Write-Host "=== Git Status Before Add ==="
|
git add config.py;
|
||||||
git status
|
git add version_history.json;
|
||||||
|
|
||||||
Write-Host "`n=== Checking file changes ==="
|
Write-Host "Checking changes...";
|
||||||
Write-Host "config.py changes:"
|
git status;
|
||||||
git diff config.py | Select-Object -First 10
|
|
||||||
Write-Host "version_history.json changes:"
|
|
||||||
git diff version_history.json | Select-Object -First 10
|
|
||||||
|
|
||||||
# 添加修改的文件
|
$hasChanges = git diff --staged --quiet;
|
||||||
Write-Host "`n=== Adding files ==="
|
|
||||||
git add config.py
|
|
||||||
Write-Host "Added config.py"
|
|
||||||
git add version_history.json
|
|
||||||
Write-Host "Added version_history.json"
|
|
||||||
|
|
||||||
# 检查暂存区
|
|
||||||
Write-Host "`n=== Git Status After Add ==="
|
|
||||||
git status
|
|
||||||
|
|
||||||
Write-Host "`n=== Staged changes ==="
|
|
||||||
git diff --staged --stat
|
|
||||||
|
|
||||||
# 检查是否有变更
|
|
||||||
$hasChanges = git diff --staged --quiet
|
|
||||||
if ($LASTEXITCODE -ne 0) {
|
if ($LASTEXITCODE -ne 0) {
|
||||||
# 动态获取当前分支名(兼容 master 和 develop)
|
$BRANCH = "${{ github.ref_name }}";
|
||||||
$BRANCH = "${{ github.ref_name }}"
|
Write-Host "Committing to branch: $BRANCH";
|
||||||
Write-Host "`nCommitting to branch: $BRANCH"
|
|
||||||
|
|
||||||
git commit -m "[skip ci] Update version to v$VERSION"
|
git commit -m "[skip ci] Update version to v$VERSION";
|
||||||
git push origin $BRANCH
|
git push origin $BRANCH;
|
||||||
|
|
||||||
Write-Host "Version changes committed and pushed to $BRANCH"
|
Write-Host "Changes committed and pushed";
|
||||||
} else {
|
} else {
|
||||||
Write-Host "No changes to commit"
|
Write-Host "No changes to commit";
|
||||||
}
|
}
|
||||||
|
|
||||||
# Step 6: Display summary
|
# Step 6: Display summary
|
||||||
@@ -190,22 +168,22 @@ jobs:
|
|||||||
if: always()
|
if: always()
|
||||||
shell: powershell
|
shell: powershell
|
||||||
run: |
|
run: |
|
||||||
# Read version from config.py
|
$VERSION = "Unknown";
|
||||||
$VERSION = "Unknown"
|
|
||||||
if (Test-Path "config.py") {
|
if (Test-Path "config.py") {
|
||||||
$configContent = Get-Content "config.py" -Raw
|
$configContent = Get-Content "config.py" -Raw;
|
||||||
if ($configContent -match 'APP_VERSION\s*=\s*"([\d.]+)"') {
|
if ($configContent -match 'APP_VERSION\s*=\s*"([\d.]+)"') {
|
||||||
$VERSION = $matches[1]
|
$VERSION = $matches[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host "=========================================="
|
Write-Host "==========================================";
|
||||||
Write-Host "GUI Version Release Summary"
|
Write-Host "GUI Version Release Summary";
|
||||||
Write-Host "=========================================="
|
Write-Host "==========================================";
|
||||||
Write-Host "Author: ${{ github.actor }}"
|
Write-Host "Author: ${{ github.actor }}";
|
||||||
Write-Host "Branch: ${{ github.ref_name }}"
|
Write-Host "Branch: ${{ github.ref_name }}";
|
||||||
Write-Host "Version: $VERSION"
|
Write-Host "Version: $VERSION";
|
||||||
Write-Host "Time: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')"
|
Write-Host "Time: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')";
|
||||||
Write-Host "Commit: ${{ github.sha }}"
|
Write-Host "Commit: ${{ github.sha }}";
|
||||||
Write-Host "=========================================="
|
Write-Host "==========================================";
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user