diff options
| -rwxr-xr-x | ci/boost/build.py | 6 | ||||
| -rwxr-xr-x | ci/build.py | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/ci/boost/build.py b/ci/boost/build.py index 541fd1e..fed6b81 100755 --- a/ci/boost/build.py +++ b/ci/boost/build.py @@ -15,7 +15,6 @@ import os.path import platform import re import shutil -import struct import subprocess import sys import tempfile @@ -44,8 +43,7 @@ def _on_windows(): def _run_executable(cmd_line): logging.info('Running executable: %s', cmd_line) - result = subprocess.run(cmd_line) - result.check_returncode() + return subprocess.run(cmd_line, check=True) class Platform(Enum): @@ -323,7 +321,7 @@ def main(argv=None): def _main(argv=None): _setup_logging() try: - download_and_build(argv) + main(argv) except Exception as e: logging.exception(e) raise diff --git a/ci/build.py b/ci/build.py index dd88156..0fb4478 100755 --- a/ci/build.py +++ b/ci/build.py @@ -11,7 +11,6 @@ # similar, but written in bash and PowerShell, respectively). import argparse -from contextlib import contextmanager import logging from enum import Enum import os @@ -39,8 +38,7 @@ def _remove_dir(path): def _run_executable(cmd_line): logging.info('Running executable: %s', cmd_line) - result = subprocess.run(cmd_line) - result.check_returncode() + return subprocess.run(cmd_line, check=True) def _run_cmake(cmake_args): @@ -108,7 +106,7 @@ class GenerationPhase: if args.boost_librarydir is not None: result.append(f'-DBOOST_LIBRARYDIR={args.boost_librarydir}') if args.cmake_args is not None: - result += [arg for arg in args.cmake_args] + result += args.cmake_args result += [f'-B{build_dir.path}'] result += [f'-H{args.src_dir}'] return result |