JOJ/Joint-Teapot
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: joj3-all exit code 1 on error

Browse Source
This commit is contained in:
张泊明518370910136 2024-10-30 18:08:55 -04:00
parent a4f6482b21
commit 52ac616ec6
Signed by: 张泊明518370910136
GPG Key ID: CA088E6D9284F870
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
joint_teapot/app.py
View File

@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, List
from filelock import FileLock from filelock import FileLock
from git import Repo from git import Repo
from typer import Argument, Option, Typer, echo from typer import Argument, Exit, Option, Typer, echo
from joint_teapot.config import Settings, set_settings, settings from joint_teapot.config import Settings, set_settings, settings
from joint_teapot.teapot import Teapot from joint_teapot.teapot import Teapot
@ -539,20 +539,20 @@ def joj3_all(
+ f"timeout: {settings.joj3_lock_file_timeout}" + f"timeout: {settings.joj3_lock_file_timeout}"
) )
with FileLock(lock_file_path, timeout=settings.joj3_lock_file_timeout).acquire(): with FileLock(lock_file_path, timeout=settings.joj3_lock_file_timeout).acquire():
logger.info("file lock acquired")
retry_interval = 1 retry_interval = 1
git_push_ok = False git_push_ok = False
while not git_push_ok: while not git_push_ok:
logger.info("file lock acquired")
repo_path = tea.pot.git.repo_clean_and_checkout(repo_name, "grading") repo_path = tea.pot.git.repo_clean_and_checkout(repo_name, "grading")
repo: Repo = tea.pot.git.get_repo(repo_name) repo: Repo = tea.pot.git.get_repo(repo_name)
if "grading" not in repo.remote().refs: if "grading" not in repo.remote().refs:
logger.error( logger.error(
'"grading" branch not found in remote, create and push it to origin first.' '"grading" branch not found in remote, create and push it to origin first.'
) )
return raise Exit(code=1)
if "grading" not in repo.branches: if "grading" not in repo.branches:
logger.error('"grading" branch not found in local, create it first.') logger.error('"grading" branch not found in local, create it first.')
return raise Exit(code=1)
repo.git.reset("--hard", "origin/grading") repo.git.reset("--hard", "origin/grading")
if not skip_scoreboard: if not skip_scoreboard:
joj3.generate_scoreboard( joj3.generate_scoreboard(
@ -598,7 +598,7 @@ def joj3_all(
) )
if retry_interval > 64: if retry_interval > 64:
logger.error(f"git push failed too many times") logger.error(f"git push failed too many times")
return raise Exit(code=1)
sleep(retry_interval) sleep(retry_interval)