diff --git a/scripts/tag.bat b/scripts/tag.bat index 92236db..295a4b9 100644 --- a/scripts/tag.bat +++ b/scripts/tag.bat @@ -1,10 +1,10 @@ @echo off setlocal enabledelayedexpansion -:: 切换到项目根目录 +:: лĿĿ¼ cd /d %~dp0.. -:: 获取版本号 +:: ȡ汾 set TAG_NAME=%1 if "%TAG_NAME%"=="" ( @@ -12,14 +12,14 @@ if "%TAG_NAME%"=="" ( exit /b 1 ) -:: 确保在 master 分支 +:: ȷ master ֧ for /f "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do set CURRENT_BRANCH=%%i if not "%CURRENT_BRANCH%"=="master" ( echo Error: Must be on master branch to tag. Current branch: %CURRENT_BRANCH% exit /b 1 ) -:: 检查是否有未提交的代码 +:: ǷδύĴ set CHANGES= for /f "tokens=*" %%i in ('git status --porcelain') do set CHANGES=%%i if not "%CHANGES%"=="" ( @@ -27,12 +27,12 @@ if not "%CHANGES%"=="" ( exit /b 1 ) -:: 拉取最新代码 +:: ȡ´ echo Updating master branch... git pull origin master if %errorlevel% neq 0 exit /b %errorlevel% -:: 检查本地和远端是否一致 +:: 鱾غԶǷһ for /f "tokens=*" %%i in ('git rev-parse @') do set LOCAL=%%i for /f "tokens=*" %%i in ('git rev-parse @{u}') do set REMOTE=%%i @@ -41,7 +41,7 @@ if not "%LOCAL%"=="%REMOTE%" ( exit /b 1 ) -:: 创建并推送 tag +:: tag echo Creating tag %TAG_NAME%... git tag -f "%TAG_NAME%" if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/scripts/tag.ps1 b/scripts/tag.ps1 index 57980da..775d0be 100644 --- a/scripts/tag.ps1 +++ b/scripts/tag.ps1 @@ -1,8 +1,8 @@ -# 切换到项目根目录 +# лĿĿ¼ $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Definition if ($ScriptDir) { Set-Location (Join-Path $ScriptDir "..") } -# 获取版本号 +# ȡ汾 $TagName = $args[0] if (-not $TagName) { @@ -10,26 +10,26 @@ if (-not $TagName) { exit 1 } -# 确保在 master 分支 +# ȷ master ֧ $CurrentBranch = git rev-parse --abbrev-ref HEAD if ($CurrentBranch -ne "master") { Write-Host "Error: Must be on master branch to tag. Current branch: $CurrentBranch" -ForegroundColor Red exit 1 } -# 检查是否有未提交的代码 +# ǷδύĴ $Changes = git status --porcelain if ($Changes) { Write-Host "Error: You have uncommitted changes. Please commit or stash them first." -ForegroundColor Red exit 1 } -# 拉取最新代码 +# ȡ´ Write-Host "Updating master branch..." git pull origin master if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -# 检查本地和远端是否一致 +# 鱾غԶǷһ $Local = git rev-parse @ $Remote = git rev-parse @{u} @@ -38,7 +38,7 @@ if ($Local -ne $Remote) { exit 1 } -# 创建并推送 tag +# tag Write-Host "Creating tag $TagName..." git tag -f "$TagName" if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }