diff --git a/NetAdmin.sln b/NetAdmin.sln index ba2149e6..08c59085 100644 --- a/NetAdmin.sln +++ b/NetAdmin.sln @@ -28,6 +28,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B25C9-0901-4923-913F-00F9A6B352A5}" ProjectSection(SolutionItems) = preProject + 1.git.pull.request.ps1 = scripts/1.git.pull.request.ps1 + 2.git.release.ps1 = scripts/2.git.release.ps1 + 3.git.recreate.branch.ps1 = scripts/3.git.recreate.branch.ps1 clean.ln.csx = scripts/clean.ln.csx code.clean.csx = scripts/code.clean.csx code.clean.ps1 = scripts/code.clean.ps1 @@ -35,8 +38,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B gen.id.linq = scripts/gen.id.linq gen.ln.cmd = scripts/gen.ln.cmd gen.resx.tt = scripts/gen.resx.tt - git.pr.ps1 = scripts/git.pr.ps1 - git.rc.ps1 = scripts/git.rc.ps1 image.optimize.csx = scripts/image.optimize.csx install.as.tpl.ps1 = scripts/install.as.tpl.ps1 rename.csx = scripts/rename.csx diff --git a/scripts/git.pr.ps1 b/scripts/1.git.pull.request.ps1 similarity index 92% rename from scripts/git.pr.ps1 rename to scripts/1.git.pull.request.ps1 index e2bfd896..1d29abac 100644 --- a/scripts/git.pr.ps1 +++ b/scripts/1.git.pull.request.ps1 @@ -8,4 +8,4 @@ git push --set-upstream origin $branch Start-Process -FilePath "https://github.com/nsnail/NetAdmin/compare/main...$branch" Write-Host "按『Enter』重建分支,『Ctrl+C』退出" Pause -./git.rc.ps1 \ No newline at end of file +./3.git.recreate.branch.ps1 \ No newline at end of file diff --git a/scripts/2.git.release.ps1 b/scripts/2.git.release.ps1 new file mode 100644 index 00000000..d1442855 --- /dev/null +++ b/scripts/2.git.release.ps1 @@ -0,0 +1,28 @@ +cd .. +$types = @{ + '1' = @('major', '主版本') + '2' = @('minor', '此版本') + '3' = @('patch', '修订版本') +} +$prefix = '' +while ($null -eq $types[$prefix]) +{ + $prefix = Read-Host "请选择版本类型`n" $( & { param($i) $i | ForEach-Object { "$_ : $( $types[$_][0] )($( $types[$_][1] ))`n" } } $types.Keys | Sort-Object ) +} +git checkout main +git branch -D release +git checkout -b release +./node_modules/.bin/standard-version -r $types[$prefix][0] +cd ./scripts +./code.clean.ps1 +git commit --amend --no-edit -a +$tag = $(git describe --tags $(git rev-list --tags --max-count=1)) +git tag -d $tag +git tag $tag +git push --tags origin release +Start-Process -FilePath "https://github.com/nsnail/NetAdmin/compare/main...release" +Write-Host "按『Enter』回到主分支,『Ctrl+C』退出" +Pause +git checkout main +git pull +git branch -D release \ No newline at end of file diff --git a/scripts/git.rc.ps1 b/scripts/3.git.recreate.branch.ps1 similarity index 100% rename from scripts/git.rc.ps1 rename to scripts/3.git.recreate.branch.ps1