diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-11-10 17:18:01 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-17 04:58:52 +0000 |
| commit | 46c238e0bdeeb695cf3f9d7f18d920d0e7d85187 (patch) | |
| tree | 40f82d1e71dd2bfcd92f8667ae6a02d1cfe8e8c2 /zephyr/zmake | |
| parent | 5f96ef6a7239352be4e3be12aca868787e20ec56 (diff) | |
| download | chrome-ec-46c238e0bdeeb695cf3f9d7f18d920d0e7d85187.tar.gz | |
zephyr: gitlab-ci: Build by project name, not directory
Switch the GitLab CI runner to use project name, instead of manually
specifying the directory. This is so that projects can specify more
than one project per directory.
BUG=b:193815337
BRANCH=none
TEST=https://gitlab.com/zephyr-ec/ec/-/pipelines/410231302
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I7a32f3be069b388741ef65af2374a5dfae22e86b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3286371
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'zephyr/zmake')
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index a5c3cb62a5..8fc9542dca 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -756,10 +756,9 @@ class Zmake: root_dir = self.module_paths["ec"] / "zephyr" for project in zmake.project.find_projects(root_dir).values(): is_test = project.config.is_test - rel_path = project.config.project_dir.relative_to(root_dir) - project_build_dir = pathlib.Path(build_dir).joinpath(rel_path) - lcov_file = pathlib.Path(build_dir).joinpath( - str(rel_path).replace("/", "_") + ".info" + project_build_dir = pathlib.Path(build_dir) / project.config.project_name + lcov_file = pathlib.Path(build_dir) / "{}.info".format( + project.config.project_name ) all_lcov_files.append(lcov_file) if is_test: |