StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix packaging outputs commands

Browse Source 
There were a few issues with the output packaging process that were
found during testing of the general-tests optimization.

First and foremost is that the packaging commands were trying to be
created before the build ran, when the outputs don't exist. I've changed
the logic to just collect the methods themselves which will then be run
during build plan execution after the build has completed.

A few other smaller issues include fixing the path to the soong_zip
binary, incorrect execution of the soong dumpvars command, and not
building the shared libs zip.

Test: atest build_test_suites_test; atest optimized_targets_test
Bug: 358215235
Change-Id: I8a3f54738f8bb5d871aadf7423844076c38b54a6
This commit is contained in:
Luca Farsi
2024-09-17 15:48:11 -07:00
parent 75501177a5
commit 8ea6742d05
4 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ci/build_test_suites.py
View File

@@ -22,6 +22,7 @@ import os
import pathlib
import subprocess
import sys
from typing import Callable
from build_context import BuildContext
import optimized_targets
@@ -68,7 +69,7 @@ class BuildPlanner:
return BuildPlan(set(self.args.extra_targets), set())
build_targets = set()
packaging_commands = []
packaging_commands_getters = []
for target in self.args.extra_targets:
if self._unused_target_exclusion_enabled(
target
@@ -84,9 +85,11 @@ class BuildPlanner:
target, self.build_context, self.args
)
build_targets.update(target_optimizer.get_build_targets())
packaging_commands.extend(target_optimizer.get_package_outputs_commands())
packaging_commands_getters.append(
target_optimizer.get_package_outputs_commands
)
return BuildPlan(build_targets, packaging_commands)
return BuildPlan(build_targets, packaging_commands_getters)
def _unused_target_exclusion_enabled(self, target: str) -> bool:
return (
@@ -98,7 +101,7 @@ class BuildPlanner:
@dataclass(frozen=True)
class BuildPlan:
build_targets: set[str]
packaging_commands: list[list[str]]
packaging_commands_getters: list[Callable[[], list[list[str]]]]
def build_test_suites(argv: list[str]) -> int:
@@ -180,9 +183,10 @@ def execute_build_plan(build_plan: BuildPlan):
except subprocess.CalledProcessError as e:
raise BuildFailureError(e.returncode) from e
for packaging_command in build_plan.packaging_commands:
for packaging_commands_getter in build_plan.packaging_commands_getters:
try:
run_command(packaging_command)
for packaging_command in packaging_commands_getter():
run_command(packaging_command)
except subprocess.CalledProcessError as e:
raise BuildFailureError(e.returncode) from e