automation-lib 6.6.580 → 6.6.581

package/commit.bat

@@ -1,50 +1,62 @@
-@echo off
-
-:: Add all changes to git
-git add .
-
-:: Commit changes with a message
-echo Committing changes...
-set /p commit_message="Enter commit message: "
-git commit -m "%commit_message%"
-sleep 2
-
-:: Push changes to the 'main' branch of the 'cp' remote
-git pull origin toan
-
-:: Read the current version from package.json
-for /f "tokens=2 delims=:, " %%i in ('findstr "version" package.json') do set currentVersion=%%i
-
-:: Remove quotes from the version string
-set currentVersion=%currentVersion:"=%
-
-:: Split version into its components
-for /f "tokens=1,2,3 delims=." %%a in ("%currentVersion%") do (
-    set major=%%a
-    set minor=%%b
-    set patch=%%c
-)
-
-:: Increment the patch version
-set /a patch+=1
-
-:: Create the new version string
-set newVersion=%major%.%minor%.%patch%
-
-:: Update the version in package.json
-powershell -Command "(Get-Content package.json) -replace '\"version\": \"%currentVersion%\"', '\"version\": \"%newVersion%\"' | Set-Content package.json"
-
-:: Display the new version
-echo New version: %newVersion%
-
-:: Run npm publish using call
-call npm run pub
-
-git add .
-sleep 1
-git commit -m "%commit_message%"
-sleep 2
-
-git push origin toan
-
-
+@echo off
+setlocal enabledelayedexpansion
+chcp 65001 >nul
+
+echo ===========================================
+echo    GIT AUTO PUSH - LIBRARY
+echo ===========================================
+
+set /p commit_message="Enter commit message: "
+if "%commit_message%"=="" (
+    echo [LOI] Commit message khong duoc de trong!
+    pause
+    exit /b
+)
+
+:: GIT ADD & COMMIT
+git add .
+git commit -m "%commit_message%"
+timeout /t 2 /nobreak >nul
+
+:: ===========================================
+:: PULL & PUSH HS (nhann6304 only)
+:: ===========================================
+echo.
+echo --- Switch to nhann6304 for [hs] remote ---
+gh auth switch --user nhann6304
+
+echo --- Pull from hs main ---
+git pull hs main
+
+:: Version bump
+for /f "tokens=2 delims=:, " %%i in ('findstr "version" package.json') do set currentVersion=%%i
+set currentVersion=%currentVersion:"=%
+for /f "tokens=1,2,3 delims=." %%a in ("%currentVersion%") do (
+    set major=%%a
+    set minor=%%b
+    set patch=%%c
+)
+set /a patch+=1
+set newVersion=%major%.%minor%.%patch%
+
+powershell -Command "(Get-Content package.json) -replace '\"version\": \"%currentVersion%\"', '\"version\": \"%newVersion%\"' | Set-Content package.json"
+echo New version: %newVersion%
+
+:: Publish
+call npm run pub
+
+:: Commit version bump & push
+git add .
+timeout /t 1 /nobreak >nul
+git commit -m "v%newVersion% - %commit_message%"
+timeout /t 2 /nobreak >nul
+
+echo --- Push to hs main ---
+git push hs main && echo [OK] Push hs main xong. || echo [LOI] Push hs main that bai.
+
+echo.
+echo ===========================================
+echo    HOAN TAT! Version: %newVersion%
+echo ===========================================
+pause
+endlocal