Skip to content

Commit

Permalink
Merge branch 'release-candidate' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
hedger committed Jun 16, 2023
2 parents a77e6e2 + 91668fb commit 7c28481
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.3
0.2.4
7 changes: 4 additions & 3 deletions ufbt/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ class SdkDeployTask:
mode: str = None
all_params: Dict[str, str] = field(default_factory=dict)

DEFAULT_HW_TARGET: ClassVar[str] = ""
DEFAULT_HW_TARGET: ClassVar[str] = "f7"

def update_from(self, other: "SdkDeployTask") -> None:
log.debug(f"deploy task update from {other=}")
Expand All @@ -454,7 +454,7 @@ def default() -> "SdkDeployTask":
@staticmethod
def from_args(args: argparse.Namespace) -> "SdkDeployTask":
task = SdkDeployTask()
task.hw_target = args.hw_target or SdkDeployTask.DEFAULT_HW_TARGET
task.hw_target = args.hw_target
task.force = args.force
for loader_cls in all_boostrap_loader_cls:
task.all_params.update(loader_cls.args_namespace_to_metadata(args))
Expand Down Expand Up @@ -607,7 +607,7 @@ def _func(self, args) -> int:
if current_task.mode:
task_to_deploy = current_task
else:
log.error("No previous SDK state was found, fetching latest release")
log.warn("No previous SDK state was found, fetching latest release")
task_to_deploy = SdkDeployTask.default()

if not sdk_deployer.deploy(task_to_deploy):
Expand Down Expand Up @@ -637,6 +637,7 @@ def _add_arguments(self, parser: argparse.ArgumentParser):

def _func(self, args) -> int:
sdk_deployer = UfbtSdkDeployer(args.ufbt_home)
log.info("If you want to clean build artifacts, use 'ufbt -c', not 'clean'")
if args.purge:
log.info(f"Cleaning complete ufbt state in {sdk_deployer.ufbt_state_dir}")
shutil.rmtree(sdk_deployer.ufbt_state_dir, ignore_errors=True)
Expand Down

0 comments on commit 7c28481

Please sign in to comment.