From 2581d878baf4982ac77204015004d0e3fcf96d67 Mon Sep 17 00:00:00 2001 From: nsnail Date: Thu, 14 Dec 2023 17:06:22 +0800 Subject: [PATCH 1/2] chore(release): 2.0.3 (#7) --- CHANGELOG.md | 10 +--------- package.json | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61de193..b7bc174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,18 +2,10 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -### 2.0.1 (2023-12-14) +### 2.0.3 (2023-12-14) ### Features * ++ ([e41652d](https://github.com/nsnail/NSExt/commit/e41652d553beda7a2eb1600da4795e07f4260330)) * 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04)) - -## 2.0.0 (2023-12-14) - - -### Features - -* ++ ([e41652d](https://github.com/nsnail/NSExt/commit/e41652d553beda7a2eb1600da4795e07f4260330)) -* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04)) \ No newline at end of file diff --git a/package.json b/package.json index b907439..1831b42 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "2.0.1", + "version": "2.0.3", "devDependencies": { "cz-git": "^1.7.1", "commitizen": "^4.3.0", @@ -11,4 +11,4 @@ "path": "node_modules/cz-git" } } -} \ No newline at end of file +} From fa3aa0527efd418799bf40790a9e69f686cfb865 Mon Sep 17 00:00:00 2001 From: tk Date: Fri, 15 Dec 2023 16:29:15 +0800 Subject: [PATCH 2/2] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- NSExt.sln | 5 ++-- 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, 29 insertions(+), 5 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 b7bc174..21e7914 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,4 +8,4 @@ All notable changes to this project will be documented in this file. See [standa ### Features * ++ ([e41652d](https://github.com/nsnail/NSExt/commit/e41652d553beda7a2eb1600da4795e07f4260330)) -* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04)) +* 增加一些扩展方法 ([1f26d0f](https://github.com/nsnail/NSExt/commit/1f26d0f28098f7ee98a9a5482096aecd53b85e04)) \ No newline at end of file diff --git a/NSExt.sln b/NSExt.sln index b75ef62..cc49f4c 100644 --- a/NSExt.sln +++ b/NSExt.sln @@ -28,14 +28,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 1831b42..fceb524 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 6105d98..58767d1 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/NSExt/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..b868a4f --- /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/NSExt/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