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

fix: less required env vars

Browse Source
This commit is contained in:
张泊明518370910136 2025-02-01 09:09:14 -05:00
parent 0a8c188a48
commit c8d6c10409
Signed by: 张泊明518370910136
GPG Key ID: CA088E6D9284F870
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
joint_teapot/app.py
View File

@ -689,22 +689,19 @@ def joj3_all_env(
logger.info(f"debug log to file: {settings.log_file_path}") logger.info(f"debug log to file: {settings.log_file_path}")
submitter = os.getenv("GITHUB_ACTOR", "") submitter = os.getenv("GITHUB_ACTOR", "")
run_number = os.getenv("GITHUB_RUN_NUMBER", "") run_number = os.getenv("GITHUB_RUN_NUMBER", "")
exercise_name = os.getenv("JOJ3_CONF_NAME", "")
commit_hash = os.getenv("GITHUB_SHA", "") commit_hash = os.getenv("GITHUB_SHA", "")
run_id = os.getenv("JOJ3_RUN_ID", "")
groups = os.getenv("JOJ3_GROUPS", "")
repository = os.getenv("GITHUB_REPOSITORY", "") repository = os.getenv("GITHUB_REPOSITORY", "")
if "" in ( if "" in (
submitter, submitter,
run_number, run_number,
exercise_name,
commit_hash, commit_hash,
run_id,
groups,
repository, repository,
): ):
logger.error("missing required env var") logger.error("missing required env var")
raise Exit(code=1) raise Exit(code=1)
run_id = os.getenv("JOJ3_RUN_ID", "")
exercise_name = os.getenv("JOJ3_CONF_NAME", "")
groups = os.getenv("JOJ3_GROUPS", "")
commit_msg = os.getenv("JOJ3_COMMIT_MSG", "") commit_msg = os.getenv("JOJ3_COMMIT_MSG", "")
force_quit_stage_name = os.getenv("JOJ3_FORCE_QUIT_STAGE_NAME") or "" force_quit_stage_name = os.getenv("JOJ3_FORCE_QUIT_STAGE_NAME") or ""
submitter_repo_name = (repository or "").split("/")[-1] submitter_repo_name = (repository or "").split("/")[-1]
@ -971,21 +968,17 @@ def joj3_check_env(
app.pretty_exceptions_enable = False app.pretty_exceptions_enable = False
set_settings(Settings(_env_file=env_path)) set_settings(Settings(_env_file=env_path))
set_logger(settings.stderr_log_level) set_logger(settings.stderr_log_level)
submitter = os.getenv("GITHUB_ACTOR") submitter = os.getenv("GITHUB_ACTOR", "")
exercise_name = os.getenv("JOJ3_CONF_NAME") repository = os.getenv("GITHUB_REPOSITORY", "")
run_id = os.getenv("JOJ3_RUN_ID") if "" in (
groups = os.getenv("JOJ3_GROUPS")
repository = os.getenv("GITHUB_REPOSITORY")
if None in (
submitter, submitter,
exercise_name,
run_id,
groups,
repository, repository,
): ):
logger.error("missing required env var") logger.error("missing required env var")
raise Exit(code=1) raise Exit(code=1)
submitter_repo_name = (repository or "").split("/")[-1] exercise_name = os.getenv("JOJ3_CONF_NAME", "")
groups = os.getenv("JOJ3_GROUPS", "")
submitter_repo_name = repository.split("/")[-1]
repo: Repo = tea.pot.git.get_repo(grading_repo_name) repo: Repo = tea.pot.git.get_repo(grading_repo_name)
now = datetime.now() now = datetime.now()
items = group_config.split(",") items = group_config.split(",")