From b652a2274fedb28f2efd671c997ea433e908b910 Mon Sep 17 00:00:00 2001 From: nsnail Date: Fri, 15 Dec 2023 16:35:06 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=93=A6=20=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=B0=83=E6=95=B4=20(#21)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- dot.sln | 10 ++++---- package.json | 2 +- .../{git.pr.ps1 => 1.git.pull.request.ps1} | 2 +- scripts/2.git.release.ps1 | 23 +++++++++++++++++++ .../{git.rc.ps1 => 3.git.recreate.branch.ps1} | 0 6 files changed, 32 insertions(+), 7 deletions(-) rename scripts/{git.pr.ps1 => 1.git.pull.request.ps1} (91%) create mode 100644 scripts/2.git.release.ps1 rename scripts/{git.rc.ps1 => 3.git.recreate.branch.ps1} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e27340..23803f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,4 +14,4 @@ All notable changes to this project will be documented in this file. See [standa ### Bug Fixes -* 🐛 构建脚本缺陷 ([#15](https://github.com/nsnail/dot/issues/15)) ([d4d5467](https://github.com/nsnail/dot/commit/d4d5467656182457e6cb3a679026ac596676e81c)) +* 🐛 构建脚本缺陷 ([#15](https://github.com/nsnail/dot/issues/15)) ([d4d5467](https://github.com/nsnail/dot/commit/d4d5467656182457e6cb3a679026ac596676e81c)) \ No newline at end of file diff --git a/dot.sln b/dot.sln index 848828e..5645672 100644 --- a/dot.sln +++ b/dot.sln @@ -13,12 +13,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0 .editorconfig = .editorconfig .gitattributes = .gitattributes .gitignore = .gitignore + CHANGELOG.md = CHANGELOG.md Directory.Build.props = Directory.Build.props - Dot.sln.DotSettings = Dot.sln.DotSettings + dot.sln.DotSettings = dot.sln.DotSettings dotnet-tools.json = dotnet-tools.json global.json = global.json LICENSE = LICENSE - nuget.config = nuget.config + NuGet.Config = NuGet.Config package.json = package.json README.md = README.md README.zh-CN.md = README.zh-CN.md @@ -26,14 +27,15 @@ 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 gen.cs.tt = scripts/gen.cs.tt 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/package.json b/package.json index 41d0c62..b907439 100644 --- a/package.json +++ b/package.json @@ -11,4 +11,4 @@ "path": "node_modules/cz-git" } } -} +} \ No newline at end of file diff --git a/scripts/git.pr.ps1 b/scripts/1.git.pull.request.ps1 similarity index 91% rename from scripts/git.pr.ps1 rename to scripts/1.git.pull.request.ps1 index 9bbf472..2a532a0 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/dot/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 0000000..1e46938 --- /dev/null +++ b/scripts/2.git.release.ps1 @@ -0,0 +1,23 @@ +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] +git push --follow-tags --force origin release +Start-Process -FilePath "https://github.com/nsnail/dot/compare/main...release" +cd ./scripts +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