diff --git a/release.ps1 b/release.ps1 index 639081a..2f14b64 100644 --- a/release.ps1 +++ b/release.ps1 @@ -1,23 +1,269 @@ +# Vendored from jiangchang-platform-kit `tools/release.ps1`. +# Source: https://git.jc2009.com/client-jiangchang/jiangchang-platform-kit/-/blob/main/tools/release.ps1 +# The PyPI wheel does not ship this script; sync periodically when upstream workflow changes. + +<# +.SYNOPSIS + One-command release script for skill repos. + +.DESCRIPTION + - Optional auto-commit + - Push current branch + - Auto-increment semantic tag (vX.Y.Z) + - Create & push tag + - Fail fast on unsafe states + +.EXAMPLES + # Safe mode (recommended): requires clean working tree + .\release.ps1 + + # Auto commit tracked/untracked changes then release + .\release.ps1 -AutoCommit -CommitMessage "chore: update skill config" + + # Dry run (show what would happen) + .\release.ps1 -DryRun + + # Custom tag prefix + .\release.ps1 -Prefix "v" -Message "正式发布" + +.NOTES + Requires: git, PowerShell 5+ + + 加密与 ZIP 内容由 CI 工作流 reusable-release-skill.yaml 的「Encrypt Source Code」步骤执行。CI 会: + - 加密 scripts/(递归 PyArmor -r,输出到包内 scripts/,与源码目录树一致) + - 复制 SKILL.md + - 复制 references/(排除 REQUIREMENTS.md) + - 复制 assets/ + - 复制 tests/ + - 复制 evals/(除 scripts 外均为明文;若目录不存在则跳过;复制时排除常见缓存与运行产物) + 本脚本在打 tag 前会做一次 scripts/ 结构自检,避免子目录未提交却仍发布。 +#> + [CmdletBinding()] param( - [string]$Prefix = "v", - [string]$Message = "正式发布", - [switch]$AutoCommit, - [switch]$RequireClean, - [string]$CommitMessage, - [switch]$DryRun + [string]$Prefix = "v", + [string]$Message = "正式发布", + [switch]$AutoCommit, + [switch]$RequireClean, + [string]$CommitMessage, + [switch]$DryRun ) Set-StrictMode -Version Latest $ErrorActionPreference = "Stop" -$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path -$sharedScript = Join-Path $scriptDir "..\jiangchang-platform-kit\tools\release.ps1" -$sharedScript = [System.IO.Path]::GetFullPath($sharedScript) - -if (-not (Test-Path $sharedScript)) { - throw "Shared release script not found: $sharedScript" +function Invoke-Git { + param([Parameter(Mandatory = $true)][string]$Args) + Write-Host ">> git $Args" -ForegroundColor DarkGray + # 将 git 的 stderr 合并进 stdout,避免 PowerShell 在 $ErrorActionPreference=Stop 下 + # 把 "remote: ..." / "warning: LF -> CRLF" 等非错误输出误判为异常。 + & cmd /c "git $Args 2>&1" + if ($LASTEXITCODE -ne 0) { + throw "git command failed: git $Args" + } } -& $sharedScript @PSBoundParameters -exit $LASTEXITCODE +function Get-GitOutput { + param([Parameter(Mandatory = $true)][string]$Args) + $output = & cmd /c "git $Args" 2>$null + if ($LASTEXITCODE -ne 0) { + throw "git command failed: git $Args" + } + return @($output) +} + +function Test-Repo { + & git rev-parse --is-inside-work-tree *> $null + return ($LASTEXITCODE -eq 0) +} + +function Get-CurrentBranch { + $b = (Get-GitOutput "branch --show-current" | Select-Object -First 1).Trim() + return $b +} + +function Get-StatusPorcelain { + $lines = @(Get-GitOutput "status --porcelain") + return $lines +} + +function Parse-SemVerTag { + param( + [string]$Tag, + [string]$TagPrefix + ) + $escaped = [regex]::Escape($TagPrefix) + $m = [regex]::Match($Tag, "^${escaped}(\d+)\.(\d+)\.(\d+)$") + if (-not $m.Success) { return $null } + + return [pscustomobject]@{ + Raw = $Tag + Major = [int]$m.Groups[1].Value + Minor = [int]$m.Groups[2].Value + Patch = [int]$m.Groups[3].Value + } +} + +function Get-NextTag { + param([string]$TagPrefix) + + $tags = Get-GitOutput "tag --list" + $parsed = @() + + foreach ($t in $tags) { + $t = $t.Trim() + if (-not $t) { continue } + $obj = Parse-SemVerTag -Tag $t -TagPrefix $TagPrefix + if ($null -ne $obj) { $parsed += $obj } + } + + if ($parsed.Count -eq 0) { + return "${TagPrefix}1.0.1" + } + + $latest = $parsed | Sort-Object Major, Minor, Patch | Select-Object -Last 1 + return "$TagPrefix$($latest.Major).$($latest.Minor).$([int]$latest.Patch + 1)" +} + +function Assert-SkillReleasePackagingSources { + param([Parameter(Mandatory = $true)][string]$SkillRoot) + + $scriptsDir = Join-Path $SkillRoot "scripts" + $mainPy = Join-Path $scriptsDir "main.py" + if (-not (Test-Path -LiteralPath $mainPy)) { + return + } + + $text = Get-Content -LiteralPath $mainPy -Raw -Encoding UTF8 -ErrorAction SilentlyContinue + if ([string]::IsNullOrWhiteSpace($text)) { + return + } + + $need = @() + if ($text -match '(?m)^\s*from\s+cli\.') { $need += 'cli' } + if ($text -match '(?m)^\s*import\s+cli\b') { $need += 'cli' } + if ($text -match '(?m)^\s*from\s+service\.') { $need += 'service' } + if ($text -match '(?m)^\s*import\s+service\b') { $need += 'service' } + if ($text -match '(?m)^\s*from\s+db\.') { $need += 'db' } + if ($text -match '(?m)^\s*import\s+db\b') { $need += 'db' } + if ($text -match '(?m)^\s*from\s+util\.') { $need += 'util' } + if ($text -match '(?m)^\s*import\s+util\b') { $need += 'util' } + + foreach ($p in ($need | Select-Object -Unique)) { + $folder = Join-Path $scriptsDir $p + if (-not (Test-Path -LiteralPath $folder)) { + throw "Release check failed: scripts/main.py imports from '$p' but folder is missing: $folder" + } + } + + $pyFiles = @(Get-ChildItem -LiteralPath $scriptsDir -Filter *.py -Recurse -File -ErrorAction SilentlyContinue) + Write-Host "Packaging check: $($pyFiles.Count) Python file(s) under scripts/ (CI will obfuscate all recursively)." -ForegroundColor DarkGray +} + +function Ensure-CleanOrAutoCommit { + param( + [switch]$DoAutoCommit, + [switch]$NeedClean, + [switch]$IsDryRun, + [string]$Msg + ) + + $status = @(Get-StatusPorcelain) + if ($status.Length -eq 0) { return } + + if ($NeedClean) { + Write-Host "Working tree is not clean and -RequireClean is enabled." -ForegroundColor Yellow + & git status --short + throw "Abort: dirty working tree." + } + + # 默认一键发布:有改动就自动提交;也可用 -AutoCommit 显式开启 + $commitMsg = $Msg + if ([string]::IsNullOrWhiteSpace($commitMsg)) { + $commitMsg = "chore: auto release commit ($(Get-Date -Format 'yyyy-MM-dd HH:mm:ss'))" + } + + if (-not $DoAutoCommit) { + Write-Host "Detected uncommitted changes, auto-committing before release..." -ForegroundColor Yellow + } + + if ($IsDryRun) { + Write-Host "[DryRun] Would run: git add -A" -ForegroundColor Yellow + Write-Host "[DryRun] Would run: git commit -m `"$commitMsg`"" -ForegroundColor Yellow + return + } + + Invoke-Git "add -A" + Invoke-Git "commit -m `"$commitMsg`"" +} + +try { + Write-Host "=== Release Script Start ===" -ForegroundColor Cyan + + if (-not (Test-Repo)) { + throw "Current directory is not a git repository." + } + + $branch = Get-CurrentBranch + if ([string]::IsNullOrWhiteSpace($branch)) { + throw "Unable to determine current branch." + } + + if ($branch -notin @("main", "master")) { + throw "Current branch is '$branch'. Release is only allowed from main/master." + } + + Invoke-Git "fetch --tags --prune origin" + + Ensure-CleanOrAutoCommit -DoAutoCommit:$AutoCommit -NeedClean:$RequireClean -IsDryRun:$DryRun -Msg $CommitMessage + + $skillRoot = (Get-GitOutput "rev-parse --show-toplevel" | Select-Object -First 1).Trim() + if (Test-Path -LiteralPath (Join-Path $skillRoot "SKILL.md")) { + Assert-SkillReleasePackagingSources -SkillRoot $skillRoot + } + + # 用 cmd /c + 2>&1 将 stderr 合并进 stdout,避免 PowerShell 在 $ErrorActionPreference=Stop + # 下把首次发布时 "fatal: ambiguous argument '@{u}'" 之类的 stderr 误判为异常。 + $upstream = & cmd /c 'git rev-parse --abbrev-ref --symbolic-full-name "@{u}" 2>&1' + $hasUpstream = ($LASTEXITCODE -eq 0) + + if ($DryRun) { + if ($hasUpstream) { + Write-Host "[DryRun] Would run: git push" -ForegroundColor Yellow + } else { + Write-Host "[DryRun] Would run: git push -u origin $branch" -ForegroundColor Yellow + } + } else { + if ($hasUpstream) { + Invoke-Git "push" + } else { + Invoke-Git "push -u origin $branch" + } + } + + $nextTag = Get-NextTag -TagPrefix $Prefix + Write-Host "Next tag: $nextTag" -ForegroundColor Green + + $existing = @(Get-GitOutput "tag --list `"$nextTag`"") + if ($existing.Length -gt 0) { + throw "Tag already exists: $nextTag" + } + + if ($DryRun) { + Write-Host "[DryRun] Would run: git tag -a $nextTag -m `"$Message`"" -ForegroundColor Yellow + Write-Host "[DryRun] Would run: git push origin $nextTag" -ForegroundColor Yellow + Write-Host "=== DryRun Complete ===" -ForegroundColor Cyan + exit 0 + } + + Invoke-Git "tag -a $nextTag -m `"$Message`"" + Invoke-Git "push origin $nextTag" + + Write-Host "Release success: $nextTag" -ForegroundColor Green + Write-Host "=== Release Script Done ===" -ForegroundColor Cyan + exit 0 +} +catch { + Write-Host "Release failed: $($_.Exception.Message)" -ForegroundColor Red + exit 1 +} diff --git a/requirements-platform-kit.txt b/requirements-platform-kit.txt new file mode 100644 index 0000000..df95bb4 --- /dev/null +++ b/requirements-platform-kit.txt @@ -0,0 +1,7 @@ +# Optional: install shared SDK from Gitea Package Registry (matches vendored scripts/jiangchang_skill_core at release time). +# +# pip install -r requirements-platform-kit.txt ^ +# --index-url https://git.jc2009.com/api/packages/client-jiangchang/pypi/simple/ ^ +# --extra-index-url https://pypi.org/simple +# +jiangchang-platform-kit>=0.1.0