Skip to content

Commit a87e50d

Browse files
committed
[build] Remove intermediate pipeline so that we can guarantee that we always have a fresh swift-dispatch when running swift tests.
In the fullness of time, we want to split the full build-script-impl pipeline so that we can begin moving library like products (libdispatch, foundation) from build-script-impl into build-script. We are not there yet since some of swift's concurrency tests have a dependency on swift dispatch being built. This breaks the build and we need to extract those tests into a separate product. But for now, this makes sense to repair the build. rdar://89046735
1 parent e5c3b3f commit a87e50d

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ def compute_product_pipelines(self):
606606
# the build-script code base. The main difference is that these are all
607607
# build, tested, and installed all at once instead of performing build,
608608
# test, install like a normal build-script product.
609-
builder.begin_impl_pipeline(should_run_epilogue_operations=False)
609+
builder.begin_impl_pipeline(should_run_epilogue_operations=True)
610610

611611
builder.add_impl_product(products.LibCXX,
612612
is_enabled=self.args.build_libcxx)
@@ -616,11 +616,6 @@ def compute_product_pipelines(self):
616616
is_enabled=self.args.build_swift)
617617
builder.add_impl_product(products.LLDB,
618618
is_enabled=self.args.build_lldb)
619-
620-
# Begin a new build-script-impl pipeline that builds libraries that we
621-
# build as part of build-script-impl but that we should eventually move
622-
# onto build-script products.
623-
builder.begin_impl_pipeline(should_run_epilogue_operations=True)
624619
builder.add_impl_product(products.LibDispatch,
625620
is_enabled=self.args.build_libdispatch)
626621
builder.add_impl_product(products.Foundation,

0 commit comments

Comments
 (0)