Skip to content

Commit fffc437

Browse files
committed
presets: Update swift macos/linux preset
Update the Swift repo build preset to depend on the mixin_swiftpm_base preset to ensure it has all the same presets as SwiftPM. Also, ensure the Swift macos/linux preset do not skip the swift-test.
1 parent cebc4d7 commit fffc437

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

utils/build-presets.ini

+4
Original file line numberDiff line numberDiff line change
@@ -609,8 +609,10 @@ mixin-preset=
609609
buildbot_incremental_base
610610
lldb-smoketest,tools=RA
611611
mixin_buildbot_install_components_with_clang
612+
mixin_swiftpm_base
612613
build-subdir=buildbot_incremental
613614

615+
skip-test-swift=false
614616
# We build release+asserts.
615617
release
616618
assertions
@@ -1077,6 +1079,7 @@ mixin-preset=
10771079
mixin-preset=
10781080
mixin_lightweight_assertions,no-stdlib-asserts
10791081
mixin_linux_installation
1082+
mixin_swiftpm_base
10801083
build-subdir=buildbot_linux
10811084
lldb
10821085
release
@@ -1094,6 +1097,7 @@ install-swiftformat
10941097
reconfigure
10951098
test-optimized
10961099
skip-test-swiftdocc
1100+
skip-test-swift=false
10971101

10981102
# gcc version on amazon linux 2 is too old to configure and build tablegen.
10991103
# Use the clang that we install in the path for macros

0 commit comments

Comments
 (0)