JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: get group from within [] of task name

Browse Source
This commit is contained in:
李衍志523370910113 2024-11-27 11:41:51 +08:00
parent 6538d5da91
commit e5530ae580
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
joj3_config_generator/processers/task.py
View File

@ -1,4 +1,5 @@
import shlex import shlex
import re
from typing import List, Tuple from typing import List, Tuple
from joj3_config_generator.models import result, task from joj3_config_generator.models import result, task
@ -9,12 +10,10 @@ def get_conf_stage(
) -> result.StageDetail: ) -> result.StageDetail:
conf_stage = result.StageDetail( conf_stage = result.StageDetail(
name=task_stage.name if task_stage.name is not None else "", name=task_stage.name if task_stage.name is not None else "",
# TODO: we may have cq in future
group=( group=(
"joj" re.search(r'\[([^\[\]]+)\]', task_stage.name).group(1)
if (task_stage.name is not None) if (task_stage.name is not None and re.search(r'\[([^\[\]]+)\]', task_stage.name))
and (("joj" in task_stage.name) or ("run" in task_stage.name)) else ""
else None
), ),
executor=result.Executor( executor=result.Executor(
name="sandbox", name="sandbox",
@ -62,7 +61,7 @@ def get_executorWithConfig(
result.CmdFile(src=f"/home/tt/.config/joj/{file}") result.CmdFile(src=f"/home/tt/.config/joj/{file}")
if not file.endswith("main.cpp") if not file.endswith("main.cpp")
else result.CmdFile( else result.CmdFile(
src=f"/home/tt/.config/joj/tests/homework/h7/e3/ex3-main.cpp" src=f"/home/tt/.config/joj/homework/h7/e3/ex3-main.cpp"
) )
) )
for file in copy_in_files for file in copy_in_files
@ -188,7 +187,6 @@ def fix_dummy(
dummy_parser = [ dummy_parser = [
"dummy", "dummy",
"result-status", "result-status",
"cpplint",
] ]
if task_stage.parsers is not None: if task_stage.parsers is not None:
for parser in task_stage.parsers: for parser in task_stage.parsers: