feat: improve updater flow and release channels
Some checks failed
Desktop Dev Pre-release / prerelease (push) Failing after 2m18s
Some checks failed
Desktop Dev Pre-release / prerelease (push) Failing after 2m18s
- added dedicated GUI updater executable and integrated launch path from main app - added stable/beta update channel selection with persisted settings and checker support - expanded CI/release validation to include updater and full test discovery
This commit is contained in:
@@ -104,12 +104,26 @@ class AutoUpdateService:
|
||||
"if %ERRORLEVEL% EQU 0 (",
|
||||
" set /a WAIT_LOOPS+=1",
|
||||
" if %WAIT_LOOPS% GEQ 180 (",
|
||||
" echo Timeout waiting for process %TARGET_PID% to exit >> \"%UPDATE_LOG%\"",
|
||||
" goto :backup",
|
||||
" echo Timeout waiting for process %TARGET_PID%, attempting force stop >> \"%UPDATE_LOG%\"",
|
||||
" taskkill /PID %TARGET_PID% /T /F >nul 2>&1",
|
||||
" timeout /t 2 /nobreak >nul",
|
||||
" tasklist /FI \"PID eq %TARGET_PID%\" | find \"%TARGET_PID%\" >nul",
|
||||
" if %ERRORLEVEL% EQU 0 goto :pid_still_running",
|
||||
" goto :wait_image_unlock",
|
||||
" )",
|
||||
" timeout /t 1 /nobreak >nul",
|
||||
" goto :wait_for_exit",
|
||||
")",
|
||||
":wait_image_unlock",
|
||||
"set /a IMG_LOOPS=0",
|
||||
":check_image",
|
||||
"tasklist /FI \"IMAGENAME eq %EXE_NAME%\" | find /I \"%EXE_NAME%\" >nul",
|
||||
"if %ERRORLEVEL% EQU 0 (",
|
||||
" set /a IMG_LOOPS+=1",
|
||||
" if %IMG_LOOPS% GEQ 60 goto :image_still_running",
|
||||
" timeout /t 1 /nobreak >nul",
|
||||
" goto :check_image",
|
||||
")",
|
||||
":backup",
|
||||
"timeout /t 1 /nobreak >nul",
|
||||
"mkdir \"%BACKUP_DIR%\" >nul 2>&1",
|
||||
@@ -134,6 +148,12 @@ class AutoUpdateService:
|
||||
":backup_error",
|
||||
"echo Auto-update failed during backup. Code %RC% >> \"%UPDATE_LOG%\"",
|
||||
"exit /b %RC%",
|
||||
":pid_still_running",
|
||||
"echo Auto-update aborted: process %TARGET_PID% is still running after force stop. >> \"%UPDATE_LOG%\"",
|
||||
"exit /b 4",
|
||||
":image_still_running",
|
||||
"echo Auto-update aborted: %EXE_NAME% still running and file lock may remain. >> \"%UPDATE_LOG%\"",
|
||||
"exit /b 5",
|
||||
]
|
||||
with open(script_path, "w", encoding="utf-8", newline="\r\n") as f:
|
||||
f.write("\r\n".join(script_lines) + "\r\n")
|
||||
@@ -152,6 +172,40 @@ class AutoUpdateService:
|
||||
creationflags=creation_flags,
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def launch_gui_updater(app_exe, source_dir, work_dir, target_pid, version=""):
|
||||
app_dir = os.path.dirname(app_exe)
|
||||
exe_name = os.path.basename(app_exe)
|
||||
updater_exe = os.path.join(app_dir, "AnabasisUpdater.exe")
|
||||
if not os.path.exists(updater_exe):
|
||||
raise RuntimeError("Файл AnabasisUpdater.exe не найден в папке приложения.")
|
||||
|
||||
creation_flags = 0
|
||||
if hasattr(subprocess, "CREATE_NEW_PROCESS_GROUP"):
|
||||
creation_flags |= subprocess.CREATE_NEW_PROCESS_GROUP
|
||||
if hasattr(subprocess, "DETACHED_PROCESS"):
|
||||
creation_flags |= subprocess.DETACHED_PROCESS
|
||||
|
||||
subprocess.Popen(
|
||||
[
|
||||
updater_exe,
|
||||
"--app-dir",
|
||||
app_dir,
|
||||
"--source-dir",
|
||||
source_dir,
|
||||
"--exe-name",
|
||||
exe_name,
|
||||
"--target-pid",
|
||||
str(target_pid),
|
||||
"--version",
|
||||
str(version or ""),
|
||||
"--work-dir",
|
||||
str(work_dir or ""),
|
||||
],
|
||||
cwd=work_dir,
|
||||
creationflags=creation_flags,
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def prepare_update(cls, download_url, checksum_url, download_name):
|
||||
work_dir = tempfile.mkdtemp(prefix="anabasis_update_")
|
||||
|
||||
Reference in New Issue
Block a user