From 7d1257d9869bfb1206d097279d6d3cf4397216ce Mon Sep 17 00:00:00 2001 From: Igor Abdrakhimov Date: Fri, 13 Dec 2024 16:36:30 -0800 Subject: [PATCH] Fixup --- .builder/actions/build_samples.py | 47 ++----------------------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/.builder/actions/build_samples.py b/.builder/actions/build_samples.py index e85d31949..71b7c952f 100644 --- a/.builder/actions/build_samples.py +++ b/.builder/actions/build_samples.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: Apache-2.0. import Builder +import itertools import os import sys @@ -62,7 +63,7 @@ def run(self, env): 'servicetests/tests/ShadowUpdate/', ] - for sample_path in samples: + for sample_path in itertools.chain(samples, servicetests, da_samples, defender_samples): build_path = os.path.join('build', sample_path) steps.append(['cmake', f'-B{build_path}', @@ -71,49 +72,7 @@ def run(self, env): '-DCMAKE_BUILD_TYPE=RelWithDebInfo']) # append extra cmake configs steps[-1].extend(cmd_args.cmake_extra) - if sys.platform == "linux" or sys.platform == "linux2": - steps[-1].extend(env.config['cmake_args']) - steps.append(['cmake', - '--build', build_path, - '--config', 'RelWithDebInfo']) - - for sample_path in servicetests: - build_path = os.path.join('build', sample_path) - steps.append(['cmake', - f'-B{build_path}', - f'-H{sample_path}', - f'-DCMAKE_PREFIX_PATH={env.install_dir}', - '-DCMAKE_BUILD_TYPE=RelWithDebInfo']) - # append extra cmake configs - steps[-1].extend(cmd_args.cmake_extra) - if sys.platform == "linux" or sys.platform == "linux2": - steps[-1].extend(env.config['cmake_args']) - steps.append(['cmake', - '--build', build_path, - '--config', 'RelWithDebInfo']) - - for sample_path in da_samples: - build_path = os.path.join('build', sample_path) - steps.append(['cmake', - f'-B{build_path}', - f'-H{sample_path}', - f'-DCMAKE_PREFIX_PATH={env.install_dir}', - '-DCMAKE_BUILD_TYPE=RelWithDebInfo']) - # append extra cmake configs - steps[-1].extend(cmd_args.cmake_extra) - if sys.platform == "linux" or sys.platform == "linux2": - steps[-1].extend(env.config['cmake_args']) - steps.append(['cmake', - '--build', build_path, - '--config', 'RelWithDebInfo']) - - for sample_path in defender_samples: - build_path = os.path.join('build', sample_path) - steps.append(['cmake', - f'-B{build_path}', - f'-H{sample_path}', - f'-DCMAKE_PREFIX_PATH={env.install_dir}', - '-DCMAKE_BUILD_TYPE=RelWithDebInfo']) + # Currently, cmake_args sets only Linux-specific options. if sys.platform == "linux" or sys.platform == "linux2": steps[-1].extend(env.config['cmake_args']) steps.append(['cmake',