Skip to content

Commit

Permalink
Merge branch 'wsip/artifacts' into 'main'
Browse files Browse the repository at this point in the history
unify artifact names

See merge request repositories/zephyr-samples-builder!18
  • Loading branch information
msierszulski committed Dec 20, 2023
2 parents e71b99f + 93fd021 commit a1c461a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions scripts/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ def main(board_dir: str, board_name: str, sample_name: str) -> None:
os.makedirs(f"build/{project_sample_name}", exist_ok=True)

# Save logs
shutil.copyfile(run.log_file, f"build/{project_sample_name}/{sample_name}-zephyr.log")
shutil.copyfile(run.log_file, f"build/{project_sample_name}/{sample_name}.log")

# Save original DTS
if run.dts_modified:
Expand All @@ -430,7 +430,7 @@ def main(board_dir: str, board_name: str, sample_name: str) -> None:
filename = os.path.basename(path)
shutil.copyfile(path, f"build/{project_sample_name}/{sample_name}-{filename}")
elif key == "elf":
shutil.copyfile(path, f"build/{project_sample_name}/zephyr-{sample_name}.elf")
shutil.copyfile(path, f"build/{project_sample_name}/{sample_name}.elf")
elif key == "dts":
shutil.copyfile(path, f"build/{project_sample_name}/{sample_name}.dts")
elif key == "config":
Expand Down
6 changes: 3 additions & 3 deletions zephyr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ project_path: "zephyrproject/zephyr"

artifact_prefix: "build/{board_name}/{sample_name}/"
artifact_names:
build-log: "{sample_name}-zephyr.log"
build-log: "{sample_name}.log"
config: "{sample_name}-config"
dts: "{sample_name}.dts"
elf: "zephyr-{sample_name}.elf"
elf-md5: "zephyr-{sample_name}.elf.md5"
elf: "{sample_name}.elf"
elf-md5: "{sample_name}.elf.md5"
sbom-app: "{sample_name}-app.spdx"
sbom-build: "{sample_name}-build.spdx"
sbom-zephyr: "{sample_name}-zephyr.spdx"
Expand Down

0 comments on commit a1c461a

Please sign in to comment.