Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion scripts/west_commands/release-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ def __init__(self):
EXPORT_DESCRIPTION,
accepts_unknown_args=False,
)
self.network_key: None | pathlib.Path = None
self.network_key_secondary: None | pathlib.Path = None

def do_add_parser(self, parser_adder):
parser = parser_adder.add_parser(
Expand Down Expand Up @@ -94,14 +96,20 @@ def do_run(self, args, _unknown_args):
self.signing_key = self._absolute_path(
self.args.release.parent, self.release["signing_key"]
)
if not self.signing_key.exists():
sys.exit(f"ERROR: Signing key {self.signing_key} does not exist")
if key := self.release.get("network_key", None):
self.network_key = self._absolute_path(self.args.release.parent, key)
if not self.network_key.exists():
sys.exit(f"ERROR: Network key {self.network_key} does not exist")
else:
self.network_key = None
if key := self.release.get("network_key_secondary", None):
self.network_key_secondary = self._absolute_path(
self.args.release.parent, key
)
if not self.network_key_secondary.exists():
sys.exit(f"ERROR: Network key {self.network_key} does not exist")
else:
self.network_key_secondary = None

Expand Down Expand Up @@ -195,7 +203,7 @@ def validate_manifest_repos_state(self) -> None:
on_disk_commit = repo.commit()
if manifest_commit != on_disk_commit:
error_msg.append(
f"Repository '{project.path}' commit mismatch ({manifest_commit.hexsha()[:8]} != {on_disk_commit.hexsha()[:8]})"
f"Repository '{project.path}' commit mismatch ({manifest_commit.hexsha[:8]} != {on_disk_commit.hexsha[:8]})"
)
# Ensure there is no uncommitted content on disk
if repo.is_dirty(untracked_files=True):
Expand Down
Loading