Skip to content

Commit 7874ecd

Browse files
gottesmmfinagolfin
authored andcommitted
[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 4e4e047 commit 7874ecd

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

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

608608
builder.add_impl_product(products.LibCXX,
609609
is_enabled=self.args.build_libcxx)
@@ -613,11 +613,6 @@ def compute_product_pipelines(self):
613613
is_enabled=self.args.build_swift)
614614
builder.add_impl_product(products.LLDB,
615615
is_enabled=self.args.build_lldb)
616-
617-
# Begin a new build-script-impl pipeline that builds libraries that we
618-
# build as part of build-script-impl but that we should eventually move
619-
# onto build-script products.
620-
builder.begin_impl_pipeline(should_run_epilogue_operations=True)
621616
builder.add_impl_product(products.LibDispatch,
622617
is_enabled=self.args.build_libdispatch)
623618
builder.add_impl_product(products.Foundation,

0 commit comments

Comments
 (0)