fix: add missing formatMoneyCompact import in WalletStatsPanel; fix bat cwd drift in all-themes builder
This commit is contained in:
@@ -23,6 +23,7 @@ REM Related: docs\si-tao-zhuti-docker-bushu-renwu.md
|
||||
REM ================================================================
|
||||
|
||||
cd /d "%~dp0..\.."
|
||||
set "ROOT_DIR=%CD%"
|
||||
|
||||
set "USE_CACHE=0"
|
||||
set "EXPORT_ONLY=0"
|
||||
@@ -114,14 +115,19 @@ REM -- Build api + admin on main branch
|
||||
if "%SKIP_API_ADMIN%"=="0" (
|
||||
echo.
|
||||
echo [INFO] Building api + admin (tag: latest) on main branch...
|
||||
pushd "%ROOT_DIR%"
|
||||
git checkout main >nul 2>&1
|
||||
call docs\docker\build-and-export-images.bat --tag latest!EXTRA_ARGS!
|
||||
if errorlevel 1 (
|
||||
set "API_BUILD_ERR=!ERRORLEVEL!"
|
||||
pushd "%ROOT_DIR%"
|
||||
if "!API_BUILD_ERR!" neq "0" (
|
||||
echo [ERROR] api/admin build failed
|
||||
set "FAILED_THEMES=!FAILED_THEMES! api/admin"
|
||||
) else (
|
||||
set /a SUCCESS_COUNT+=1
|
||||
)
|
||||
popd
|
||||
popd
|
||||
echo.
|
||||
echo [INFO] Restoring original branch: %ORIGINAL_BRANCH%
|
||||
git checkout %ORIGINAL_BRANCH% >nul 2>&1
|
||||
@@ -185,20 +191,31 @@ echo ----------------------------------------------------------------
|
||||
echo [INFO] Theme: %THEME_BRANCH% (image tag: %THEME_TAG%)
|
||||
echo ----------------------------------------------------------------
|
||||
|
||||
REM -- Always operate from the repo root
|
||||
pushd "%ROOT_DIR%"
|
||||
|
||||
git checkout %THEME_BRANCH% >nul 2>&1
|
||||
if errorlevel 1 (
|
||||
echo [ERROR] Cannot switch to branch %THEME_BRANCH% -- skipping
|
||||
set "FAILED_THEMES=!FAILED_THEMES! %THEME_BRANCH%"
|
||||
popd
|
||||
exit /b 0
|
||||
)
|
||||
echo [INFO] Switched to %THEME_BRANCH%
|
||||
|
||||
call docs\docker\build-and-export-images.bat --service player --tag %THEME_TAG%!EXTRA_ARGS!
|
||||
if errorlevel 1 (
|
||||
set "THEME_BUILD_ERR=!ERRORLEVEL!"
|
||||
|
||||
REM -- Restore working directory after call (child bat changes cwd)
|
||||
pushd "%ROOT_DIR%"
|
||||
|
||||
if "!THEME_BUILD_ERR!" neq "0" (
|
||||
echo [ERROR] Player build failed for %THEME_BRANCH%
|
||||
set "FAILED_THEMES=!FAILED_THEMES! %THEME_BRANCH%"
|
||||
) else (
|
||||
echo [OK] thebet365-player:%THEME_TAG% exported successfully
|
||||
set /a SUCCESS_COUNT+=1
|
||||
)
|
||||
popd
|
||||
popd
|
||||
exit /b 0
|
||||
|
||||
Reference in New Issue
Block a user