Skip to content

Commit 284650b

Browse files
committed
[presets] Add clang install to bots that test indexstore-db/sourcekit-lsp
At a minimum, we need to install libIndexStore to enable testing the indexer, but it's better to also include clang/clangd, since this lets us enable all of our tests on these bots. This commit uses the swift-install-components and llvm-install-components from the Package bots, which increases the similarity between our PR tests and package bots. In addition to the sourcekit-lsp/indexstore-db PR test bots, this affects the following bots that test indexstore-db and didn't already install clang: * Linux * incremental * incremental long test * swiftpm PR test * macOS * PR test * PR smoke test * incremental * swiftpm PR test Based on looking at recent build logs for the package bots, this should only add <5 seconds to the incremental build.
1 parent a8dc4be commit 284650b

File tree

1 file changed

+39
-13
lines changed

1 file changed

+39
-13
lines changed

utils/build-presets.ini

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ dash-dash
1818

1919
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;parser-lib;editor-integration;tools;toolchain-tools;testsuite-tools;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers;
2020

21+
[preset: mixin_buildbot_install_components_with_clang]
22+
swift-install-components=compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
23+
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
2124

2225
[preset: mixin_buildbot_trunk_base]
2326
# Build standard library and SDK overlay for iOS device and simulator.
@@ -322,7 +325,9 @@ tvos
322325
watchos
323326

324327
[preset: buildbot_incremental,tools=RA,stdlib=RA]
325-
mixin-preset=buildbot_incremental_base_all_platforms
328+
mixin-preset=
329+
buildbot_incremental_base_all_platforms
330+
mixin_buildbot_install_components_with_clang
326331

327332
build-subdir=buildbot_incremental
328333

@@ -351,6 +356,7 @@ skip-test-watchos
351356
install-swift
352357
install-llbuild
353358
install-swiftpm
359+
install-libcxx
354360

355361
[preset: buildbot_incremental,tools=RA,stdlib=RA,xcode]
356362
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
@@ -518,6 +524,7 @@ swift-stdlib-build-type=RelWithDebInfo
518524
mixin-preset=
519525
buildbot_incremental_base
520526
lldb-smoketest,tools=RA
527+
mixin_buildbot_install_components_with_clang
521528
build-subdir=buildbot_incremental
522529

523530
# We build release+asserts.
@@ -551,6 +558,7 @@ sourcekit-lsp
551558
install-swift
552559
install-llbuild
553560
install-swiftpm
561+
install-libcxx
554562

555563
# We need to build the unittest extras so we can test
556564
build-swift-stdlib-unittest-extra
@@ -717,8 +725,14 @@ swift-enable-ast-verifier=0
717725
#===------------------------------------------------------------------------===#
718726
# Linux Builders
719727
#===------------------------------------------------------------------------===#
728+
[preset: mixin_linux_install_components_with_clang]
729+
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
730+
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
731+
720732
[preset: mixin_linux_installation]
721-
mixin-preset=mixin_lightweight_assertions
733+
mixin-preset=
734+
mixin_lightweight_assertions
735+
mixin_linux_install_components_with_clang
722736

723737
llbuild
724738
swiftpm
@@ -736,8 +750,6 @@ install-swiftpm
736750
install-xctest
737751
install-libicu
738752
install-prefix=/usr
739-
swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
740-
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
741753
install-libcxx
742754
build-swift-static-stdlib
743755
build-swift-static-sdk-overlay
@@ -993,7 +1005,9 @@ build-ninja
9931005
reconfigure
9941006

9951007
[preset: buildbot_incremental_linux]
996-
mixin-preset=buildbot_incremental_linux_base
1008+
mixin-preset=
1009+
buildbot_incremental_linux_base
1010+
mixin_linux_install_components_with_clang
9971011
build-subdir=buildbot_incremental
9981012

9991013
libicu
@@ -1013,6 +1027,7 @@ install-swiftpm
10131027
install-foundation
10141028
install-libdispatch
10151029
install-xctest
1030+
install-libcxx
10161031

10171032
[preset: buildbot_incremental_linux,long_test]
10181033
mixin-preset=buildbot_incremental_linux
@@ -1104,6 +1119,7 @@ sourcekit-lsp=0
11041119
# OS X Package Builders
11051120
#===------------------------------------------------------------------------===#
11061121
[preset: mixin_osx_package_base]
1122+
mixin-preset=mixin_buildbot_install_components_with_clang
11071123
ios
11081124
tvos
11091125
watchos
@@ -1143,6 +1159,7 @@ skip-install-swiftsyntax-module
11431159
install-skstresstester
11441160
install-swiftevolve
11451161
install-playgroundsupport
1162+
install-libcxx
11461163

11471164
install-destdir=%(install_destdir)s
11481165

@@ -1166,10 +1183,6 @@ toolchain-benchmarks
11661183
# If someone uses this for incremental builds, force reconfiguration.
11671184
reconfigure
11681185

1169-
swift-install-components=compiler;clang-resource-dir-symlink;stdlib;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-xpc-service;swift-remote-mirror;swift-remote-mirror-headers
1170-
llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
1171-
install-libcxx
1172-
11731186
# Path to the .tar.gz package we would create.
11741187
installable-package=%(installable_package)s
11751188

@@ -1345,6 +1358,7 @@ swift-stdlib-build-type=Release
13451358
mixin-preset=
13461359
buildbot_incremental_base_all_platforms
13471360
lldb-smoketest,tools=RA
1361+
mixin_buildbot_install_components_with_clang
13481362

13491363
build-subdir=buildbot_incremental
13501364

@@ -1363,6 +1377,7 @@ sourcekit-lsp
13631377
install-swift
13641378
install-llbuild
13651379
install-swiftpm
1380+
install-libcxx
13661381

13671382
# Build Playground support
13681383
playgroundsupport
@@ -1409,7 +1424,9 @@ skip-test-osx
14091424
#===------------------------------------------------------------------------===#
14101425

14111426
[preset: buildbot_swiftpm_macos_platform,tools=RA,stdlib=RA]
1412-
mixin-preset=buildbot_incremental_base
1427+
mixin-preset=
1428+
buildbot_incremental_base
1429+
mixin_buildbot_install_components_with_clang
14131430

14141431
build-subdir=buildbot_incremental
14151432

@@ -1426,6 +1443,7 @@ sourcekit-lsp
14261443
install-swift
14271444
install-llbuild
14281445
install-swiftpm
1446+
install-libcxx
14291447

14301448
dash-dash
14311449

@@ -1438,7 +1456,9 @@ skip-test-llbuild
14381456
#===------------------------------------------------------------------------===#
14391457

14401458
[preset: buildbot_swiftpm_linux_platform,tools=RA,stdlib=RA]
1441-
mixin-preset=buildbot_incremental_base
1459+
mixin-preset=
1460+
buildbot_incremental_base
1461+
mixin_linux_install_components_with_clang
14421462

14431463
build-subdir=buildbot_incremental
14441464

@@ -1460,6 +1480,7 @@ install-swiftpm
14601480
install-foundation
14611481
install-libdispatch
14621482
install-xctest
1483+
install-libcxx
14631484

14641485
skip-test-swift
14651486
skip-test-cmark
@@ -1510,22 +1531,27 @@ sourcekit-lsp
15101531
install-swift
15111532
install-llbuild
15121533
install-swiftpm
1534+
install-libcxx
15131535

15141536
skip-test-swift
15151537
skip-test-cmark
15161538
skip-test-llbuild
15171539
skip-test-swiftpm
15181540

15191541
[preset: buildbot_swiftpm_package_macos]
1520-
mixin-preset=buildbot_swiftpm_package_base
1542+
mixin-preset=
1543+
buildbot_swiftpm_package_base
1544+
mixin_buildbot_install_components_with_clang
15211545

15221546
# Build stdlib for all platforms.
15231547
ios
15241548
tvos
15251549
watchos
15261550

15271551
[preset: buildbot_swiftpm_package_linux]
1528-
mixin-preset=buildbot_swiftpm_package_base
1552+
mixin-preset=
1553+
buildbot_swiftpm_package_base
1554+
mixin_linux_install_components_with_clang
15291555

15301556
libdispatch
15311557
foundation

0 commit comments

Comments
 (0)