[skel] create_gitlab_jobs: Make sure contest/problem paths are relative to Git repo root

Author: mpsijm

bin/skel.py

@@ -5,6 +5,7 @@
 # Local imports
 import config
 from export import force_single_language
+from problem import Problem
 from util import *
 import contest
 
@@ -323,22 +324,33 @@ def copy_skel_dir(problems):
 
 
 # NOTE: This is one of few places that prints to stdout instead of stderr.
-def create_gitlab_jobs(contest, problems):
-    def problem_source_dir(problem):
-        return problem.path.resolve().relative_to(Path("..").resolve())
+def create_gitlab_jobs(contest: str, problems: list[Problem]):
+    git_root_path = Path(os.popen("git rev-parse --show-toplevel").read().strip()).resolve()
+
+    def problem_source_dir(problem: Problem):
+        return problem.path.resolve().relative_to(git_root_path)
 
     header_yml = (config.TOOLS_ROOT / "skel/gitlab_ci/header.yaml").read_text()
-    print(substitute(header_yml, locals()))
+    print(header_yml)
 
     contest_yml = (config.TOOLS_ROOT / "skel/gitlab_ci/contest.yaml").read_text()
-    changes = ""
-    for problem in problems:
-        changes += "      - " + str(problem_source_dir(problem)) + "/problem_statement/**/*\n"
-    print(substitute(contest_yml, locals()))
+    contest_path = Path(".").resolve().relative_to(git_root_path)
+    changes = "".join(
+        "      - " + str(problem_source_dir(problem)) + "/problem_statement/**/*\n"
+        for problem in problems
+    )
+    print(
+        substitute(
+            contest_yml, {"contest": contest, "contest_path": str(contest_path), "changes": changes}
+        )
+    )
 
     problem_yml = (config.TOOLS_ROOT / "skel/gitlab_ci/problem.yaml").read_text()
     for problem_obj in problems:
-        changesdir = problem_source_dir(problem_obj)
+        problem_path = problem_source_dir(problem_obj)
         problem = problem_obj.name
         print("\n")
-        print(substitute(problem_yml, locals()), end="")
+        print(
+            substitute(problem_yml, {"problem": problem, "problem_path": str(problem_path)}),
+            end="",
+        )

skel/gitlab_ci/contest.yaml

@@ -1,7 +1,7 @@
 contest_pdf_{%contest%}:
   script:
-      - ./bt pdf --cp --error --no-bar --contest {%contest%}
-      - ./bt solutions --cp --error --no-bar --contest {%contest%}
+      - ./bt pdf --cp --error --no-bar --contest {%contest_path%}
+      - ./bt solutions --cp --error --no-bar --contest {%contest_path%}
   only:
     refs:
       - master
@@ -11,5 +11,5 @@ contest_pdf_{%contest%}:
   artifacts:
     expire_in: 1 week
     paths:
-      - {%contest%}/contest*.pdf
-      - {%contest%}/solution*.pdf
+      - {%contest_path%}/contest*.pdf
+      - {%contest_path%}/solution*.pdf

skel/gitlab_ci/problem.yaml

@@ -1,23 +1,23 @@
 verify_{%problem%}:
   script:
-    - ./bt all --cp --error --no-bar --force --jobs 0 --problem {%contest%}/{%problem%}
+    - ./bt all --cp --error --no-bar --force --jobs 0 --problem {%problem_path%}
   only:
     refs:
       - master
       - merge_requests
     changes:
-      #- {%changesdir%}/problem_statement/**/*
-      - {%changesdir%}/problem.yaml
-      - {%changesdir%}/.timelimit
-      - {%changesdir%}/data/**/*
-      - {%changesdir%}/generators/**/*
-      - {%changesdir%}/input_validators/**/*
-      - {%changesdir%}/answer_validators/**/*
-      - {%changesdir%}/output_validators/**/*
-      - {%changesdir%}/submissions/**/*
-      - {%changesdir%}/visualizers/**/*
-      #- {%changesdir%}/attachments/**/*
+      #- {%problem_path%}/problem_statement/**/*
+      - {%problem_path%}/problem.yaml
+      - {%problem_path%}/.timelimit
+      - {%problem_path%}/data/**/*
+      - {%problem_path%}/generators/**/*
+      - {%problem_path%}/input_validators/**/*
+      - {%problem_path%}/answer_validators/**/*
+      - {%problem_path%}/output_validators/**/*
+      - {%problem_path%}/submissions/**/*
+      - {%problem_path%}/visualizers/**/*
+      #- {%problem_path%}/attachments/**/*
   artifacts:
     expire_in: 1 week
     paths:
-      - {%contest%}/{%problem%}/problem*.pdf
+      - {%problem_path%}/problem*.pdf