From 6d513096d35dd668c413156dfa4c8ea7445b03fb Mon Sep 17 00:00:00 2001 From: lincube Date: Mon, 20 Apr 2026 18:16:17 +0800 Subject: [PATCH] ci: pin pdcc client version separately from app version --- .github/workflows/release.yml | 4 ++-- scripts/Install-Pdcc.ps1 | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59e4b7d..4ec34a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -722,7 +722,7 @@ jobs: PRIMARY_VERSION: ${{ needs.prepare.outputs.version }} PDCC_primaryVersion: ${{ needs.prepare.outputs.version }} PDCC_version: ${{ needs.prepare.outputs.version }} - PDC_CLIENT_VERSION: ${{ vars.PDC_CLIENT_VERSION }} + PDC_CLIENT_VERSION: ${{ vars.PDC_CLIENT_VERSION || '1.0.1.0' }} S3_ENDPOINT: ${{ vars.S3_ENDPOINT }} S3_BUCKET: ${{ vars.S3_BUCKET }} S3_REGION: ${{ vars.S3_REGION }} @@ -941,7 +941,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - ./scripts/Install-Pdcc.ps1 -Repository "ClassIsland/PhainonDistributionCenter" -OutputDir "./pdcc" + ./scripts/Install-Pdcc.ps1 -Repository "ClassIsland/PhainonDistributionCenter" -Version "$env:PDC_CLIENT_VERSION" -OutputDir "./pdcc" - name: Publish with PDCC shell: pwsh diff --git a/scripts/Install-Pdcc.ps1 b/scripts/Install-Pdcc.ps1 index a725045..5a32ca3 100644 --- a/scripts/Install-Pdcc.ps1 +++ b/scripts/Install-Pdcc.ps1 @@ -36,10 +36,6 @@ if ([string]::IsNullOrWhiteSpace($releaseTag)) { $releaseTag = $env:PDCC_VERSION } -if ([string]::IsNullOrWhiteSpace($releaseTag)) { - $releaseTag = $env:PDCC_version -} - $tempDir = Join-Path $env:RUNNER_TEMP "pdcc-install" if (Test-Path -LiteralPath $tempDir) { Remove-Item -LiteralPath $tempDir -Recurse -Force