From c4ada3326ba3564523ed82fdd5daf7ce415cb0ea Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Sat, 16 Sep 2023 10:06:51 +0530 Subject: [PATCH] [build] Add back intermediate pipeline so that the corelibs are not built before the compiler tests are run This reverts 01328417e but moves libdispatch into the earlier pipeline, so that it alone is built before the compiler validation suite is run. --- .../swift_build_support/build_script_invocation.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py index 68ca195fc2ce1..483e1ffb5096a 100644 --- a/utils/swift_build_support/swift_build_support/build_script_invocation.py +++ b/utils/swift_build_support/swift_build_support/build_script_invocation.py @@ -603,7 +603,7 @@ def compute_product_pipelines(self): # the build-script code base. The main difference is that these are all # build, tested, and installed all at once instead of performing build, # test, install like a normal build-script product. - builder.begin_impl_pipeline(should_run_epilogue_operations=True) + builder.begin_impl_pipeline(should_run_epilogue_operations=False) builder.add_impl_product(products.LibCXX, is_enabled=self.args.build_libcxx) @@ -615,6 +615,11 @@ def compute_product_pipelines(self): is_enabled=self.args.build_lldb) builder.add_impl_product(products.LibDispatch, is_enabled=self.args.build_libdispatch) + + # Begin a new build-script-impl pipeline that builds libraries that we + # build as part of build-script-impl but that we should eventually move + # onto build-script products. + builder.begin_impl_pipeline(should_run_epilogue_operations=True) builder.add_impl_product(products.Foundation, is_enabled=self.args.build_foundation) builder.add_impl_product(products.XCTest,