.gitea/workflows/deploy-client.yml

@@ -6,7 +6,7 @@ name: deploy-client
 on:
   push:
     tags:
-      - 'deploy-cv*.*.*.*'
+      - 'deploy-cv*.*.*'
 
 jobs:
   deploy:
@@ -20,10 +20,10 @@ jobs:
           Set-StrictMode -Version Latest
           $ErrorActionPreference = 'Stop'
 
-          # 从触发标签解析版本号: deploy-cv1.2.3.4 -> 1.2.3.4
+          # 从触发标签解析版本号: deploy-cv1.2.3 -> 1.2.3
           $deployTag = '${{ github.ref_name }}'
-          if (-not ($deployTag -match '^deploy-cv(\d+\.\d+\.\d+\.\d+)$')) {
-            throw "Trigger tag '$deployTag' must match deploy-cvx.x.x.x."
+          if (-not ($deployTag -match '^deploy-cv(\d+\.\d+\.\d+)$')) {
+            throw "Trigger tag '$deployTag' must match deploy-cvx.x.x."
           }
           $version = $Matches[1]
 
@@ -104,8 +104,7 @@ jobs:
           }
           $innerZipPath = Join-Path -Path $targetDir -ChildPath "HighErpAgent-v$version-deploy.zip"
           Write-Host "Extracting $assetName -> $targetDir"
-          & $sevenZipPath x "$encryptedZipPath" -p"$env:DEPLOY_ZIP_PASSWORD" -o"$targetDir" -aoa *>&1 | Out-Null
-          if ($LASTEXITCODE -ne 0) { throw "7z extraction failed (exit code $LASTEXITCODE)." }
+          & $sevenZipPath x "$encryptedZipPath" -p"$env:DEPLOY_ZIP_PASSWORD" -o"$targetDir" -aoa
 
           if (-not (Test-Path -Path $innerZipPath)) { throw "Inner deploy zip not found after extracting '$assetName': '$innerZipPath'." }
           Write-Host "Expanding inner zip -> $targetDir"

.gitea/workflows/deploy-server.yml

@@ -6,7 +6,7 @@ name: deploy-server
 on:
   push:
     tags:
-      - 'deploy-sv*.*.*.*'
+      - 'deploy-sv*.*.*'
 
 jobs:
   deploy:
@@ -20,10 +20,10 @@ jobs:
           Set-StrictMode -Version Latest
           $ErrorActionPreference = 'Stop'
 
-          # 从触发标签解析版本号: deploy-sv1.2.3.4 -> 1.2.3.4
+          # 从触发标签解析版本号: deploy-sv1.2.3 -> 1.2.3
           $deployTag = '${{ github.ref_name }}'
-          if (-not ($deployTag -match '^deploy-sv(\d+\.\d+\.\d+\.\d+)$')) {
-            throw "Trigger tag '$deployTag' must match deploy-svx.x.x.x."
+          if (-not ($deployTag -match '^deploy-sv(\d+\.\d+\.\d+)$')) {
+            throw "Trigger tag '$deployTag' must match deploy-svx.x.x."
           }
           $version = $Matches[1]
 
@@ -107,8 +107,7 @@ jobs:
           }
 
           Write-Host "Extracting $assetName -> $deployRoot"
-          & $sevenZipPath x "$encryptedZipPath" -p"$env:DEPLOY_ZIP_PASSWORD" -o"$deployRoot" -aoa *>&1 | Out-Null
-          if ($LASTEXITCODE -ne 0) { throw "7z extraction failed (exit code $LASTEXITCODE)." }
+          & $sevenZipPath x "$encryptedZipPath" -p"$env:DEPLOY_ZIP_PASSWORD" -o"$deployRoot" -aoa
           Remove-Item -Path $encryptedZipPath -Force
 
           Write-Host "Starting service $serviceName"