Skip to content

Commit 2c42a38

Browse files
committed
[Build] Skip early-* on non-darwin hosts
These builds do not work outside of darwin currently. Rather than adding the skip to all the necessary build presets, just disable in the product instead.
1 parent 0f0e68f commit 2c42a38

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

utils/build-presets.ini

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -890,11 +890,6 @@ installable-package=%(installable_package)s
890890
# in Linux CI bots
891891
relocate-xdg-cache-home-under-build-subdir
892892

893-
# Temporarily disable early swift driver/syntax builds so that linux images
894-
# can use the swift release images as a base.
895-
skip-early-swift-driver
896-
skip-early-swiftsyntax
897-
898893
[preset: buildbot_linux_base]
899894
mixin-preset=
900895
mixin_linux_installation
@@ -1149,11 +1144,6 @@ reconfigure
11491144
# in Linux CI bots
11501145
relocate-xdg-cache-home-under-build-subdir
11511146

1152-
# Temporarily disable early swift driver/syntax builds so that linux images
1153-
# can use the swift release images as a base.
1154-
skip-early-swift-driver
1155-
skip-early-swiftsyntax
1156-
11571147
[preset: buildbot_incremental_linux]
11581148
mixin-preset=
11591149
buildbot_incremental_linux_base

utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ def is_before_build_script_impl_product(cls):
4242
return True
4343

4444
def should_build(self, host_target):
45+
# Temporarily disable for non-darwin since this build never works
46+
# outside of that case currently.
47+
if sys.platform != 'darwin':
48+
return False
49+
4550
if self.is_cross_compile_target(host_target):
4651
return False
4752

utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ def is_before_build_script_impl_product(cls):
3232
return True
3333

3434
def should_build(self, host_target):
35+
# Temporarily disable for non-darwin since this build never works
36+
# outside of that case currently.
37+
if sys.platform != 'darwin':
38+
return False
39+
3540
if self.args.build_early_swiftsyntax:
3641
if toolchain.host_toolchain().find_tool("swift") is None:
3742
warn_msg = 'Host toolchain could not locate a '\

0 commit comments

Comments
 (0)