From 82daa321a2916557e14c0a7286639c06c2197af4 Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Thu, 4 Jun 2020 14:10:08 +0200 Subject: [PATCH] Don't use all projects for master / release builds --- scripts/buildkite/build_master_pipeline.py | 3 ++- scripts/premerge_checks.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/buildkite/build_master_pipeline.py b/scripts/buildkite/build_master_pipeline.py index 3573ec3..3e14346 100755 --- a/scripts/buildkite/build_master_pipeline.py +++ b/scripts/buildkite/build_master_pipeline.py @@ -28,7 +28,8 @@ if __name__ == '__main__': 'export SRC=${BUILDKITE_BUILD_PATH}/llvm-premerge-checks', 'rm -rf ${SRC}', 'git clone --depth 1 --branch ${scripts_branch} https://github.com/google/llvm-premerge-checks.git ${SRC}', - '${SRC}/scripts/premerge_checks.py --check-clang-format --check-clang-tidy --projects=default', + '${SRC}/scripts/premerge_checks.py --check-clang-format --check-clang-tidy ' + '--projects="clang;clang-tools-extra;libc;libcxx;libcxxabi;lld;libunwind;mlir;flang"', ], 'artifact_paths': ['artifacts/**/*', '*_result.json'], 'agents': {'queue': queue, 'os': 'linux'} diff --git a/scripts/premerge_checks.py b/scripts/premerge_checks.py index 2bfcdb8..b8d2dbd 100755 --- a/scripts/premerge_checks.py +++ b/scripts/premerge_checks.py @@ -88,7 +88,10 @@ if __name__ == '__main__': parser.add_argument('--log-level', type=str, default='WARNING') parser.add_argument('--check-clang-format', action='store_true') parser.add_argument('--check-clang-tidy', action='store_true') - parser.add_argument('--projects', type=str, default='detect', choices=['detect', 'default']) + parser.add_argument('--projects', type=str, default='detect', + help="Projects to select, either a list or projects like 'clang;libc', or " + "'detect' to automatically infer proejcts from the diff, or " + "'default' to add all enabled projects") args = parser.parse_args() logging.basicConfig(level=args.log_level, format='%(levelname)-7s %(message)s') build_dir = ''