From 9939a0f29d3ad5a674d614ddae9026f5ef70d792 Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Mon, 28 Jun 2021 15:45:53 +0200 Subject: [PATCH] keep build directory --- scripts/premerge_checks.py | 4 ++-- scripts/run_cmake.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/premerge_checks.py b/scripts/premerge_checks.py index d306c7b..302f130 100755 --- a/scripts/premerge_checks.py +++ b/scripts/premerge_checks.py @@ -40,7 +40,7 @@ def ninja_all_report(step: Step, _: Report): sys.stdout.buffer.write, sys.stderr.buffer.write, 'ninja all', cwd=build_dir) - logging.debug(f'ninja all: returned {rc}') + logging.debug(f'{build_dir}, ninja all: returned {rc}') step.set_status_from_exit_code(rc) @@ -51,7 +51,7 @@ def ninja_check_all_report(step: Step, _: Report): sys.stdout.buffer.write, sys.stderr.buffer.write, 'ninja check-all', cwd=build_dir) - logging.debug(f'ninja check-all: returned {rc}') + logging.debug(f'{build_dir}, ninja check-all: returned {rc}') step.set_status_from_exit_code(rc) diff --git a/scripts/run_cmake.py b/scripts/run_cmake.py index f8229e5..d9eee2f 100755 --- a/scripts/run_cmake.py +++ b/scripts/run_cmake.py @@ -145,8 +145,12 @@ def run(projects: str, repo_path: str, config_file_path: str = None, *, dry_run: script_dir = os.path.dirname(__file__) config_file_path = os.path.join(script_dir, 'run_cmake_config.yaml') config = Configuration(config_file_path) - - build_dir = os.path.abspath(os.path.join(repo_path, 'build')) + build_dir = os.path.abspath(os.path.join(os.getenv("BUILDKITE_BUILD_PATH"), 'llvm_build')) + logging.info(f"build directory '{build_dir}'") + if os.path.isdir(build_dir): + logging.info("directory exist") + if os.getenv("ph_no_cache") is None: + return 0, build_dir, [], commands if not dry_run: secure_delete(build_dir) os.makedirs(build_dir)