Merge pull request #26300 from benlangmuir/preset-clang

[presets] Add clang install to bots that test indexstore-db/sourcekit-lsp

utils/build-presets.ini

@@ -18,6 +18,9 @@ dash-dash
 
 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;
 
+[preset: mixin_buildbot_install_components_with_clang]
+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
+llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
 
 [preset: mixin_buildbot_trunk_base]
 # Build standard library and SDK overlay for iOS device and simulator.
@@ -308,14 +311,18 @@ tvos
 watchos
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base_all_platforms
+mixin-preset=
+    buildbot_incremental_base_all_platforms
+    mixin_buildbot_install_components_with_clang
 
 build-subdir=buildbot_incremental
 
 # Build Release without debug info, because it is faster to build.
 release
 assertions
 
+libcxx
+
 # Build llbuild & swiftpm here
 llbuild
 swiftpm
@@ -337,6 +344,7 @@ skip-test-watchos
 install-swift
 install-llbuild
 install-swiftpm
+install-libcxx
 
 [preset: buildbot_incremental,tools=RA,stdlib=RA,xcode]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
@@ -504,6 +512,7 @@ swift-stdlib-build-type=RelWithDebInfo
 mixin-preset=
     buildbot_incremental_base
     lldb-smoketest,tools=RA
+    mixin_buildbot_install_components_with_clang
 build-subdir=buildbot_incremental
 
 # We build release+asserts.
@@ -530,13 +539,15 @@ verbose-build
 # Build ninja while we are at it
 build-ninja
 
+libcxx
 llbuild
 swiftpm
 indexstore-db
 sourcekit-lsp
 install-swift
 install-llbuild
 install-swiftpm
+install-libcxx
 
 # We need to build the unittest extras so we can test
 build-swift-stdlib-unittest-extra
@@ -703,8 +714,14 @@ swift-enable-ast-verifier=0
 #===------------------------------------------------------------------------===#
 # Linux Builders
 #===------------------------------------------------------------------------===#
+[preset: mixin_linux_install_components_with_clang]
+swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
+llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
+
 [preset: mixin_linux_installation]
-mixin-preset=mixin_lightweight_assertions
+mixin-preset=
+    mixin_lightweight_assertions
+    mixin_linux_install_components_with_clang
 
 llbuild
 swiftpm
@@ -722,8 +739,6 @@ install-swiftpm
 install-xctest
 install-libicu
 install-prefix=/usr
-swift-install-components=autolink-driver;compiler;clang-resource-dir-symlink;stdlib;swift-remote-mirror;sdk-overlay;parser-lib;toolchain-tools;license;sourcekit-inproc
-llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
 install-libcxx
 build-swift-static-stdlib
 build-swift-static-sdk-overlay
@@ -979,9 +994,12 @@ build-ninja
 reconfigure
 
 [preset: buildbot_incremental_linux]
-mixin-preset=buildbot_incremental_linux_base
+mixin-preset=
+    buildbot_incremental_linux_base
+    mixin_linux_install_components_with_clang
 build-subdir=buildbot_incremental
 
+libcxx
 libicu
 llbuild
 swiftpm
@@ -999,6 +1017,7 @@ install-swiftpm
 install-foundation
 install-libdispatch
 install-xctest
+install-libcxx
 
 [preset: buildbot_incremental_linux,long_test]
 mixin-preset=buildbot_incremental_linux
@@ -1090,6 +1109,7 @@ sourcekit-lsp=0
 # OS X Package Builders
 #===------------------------------------------------------------------------===#
 [preset: mixin_osx_package_base]
+mixin-preset=mixin_buildbot_install_components_with_clang
 ios
 tvos
 watchos
@@ -1129,6 +1149,7 @@ skip-install-swiftsyntax-module
 install-skstresstester
 install-swiftevolve
 install-playgroundsupport
+install-libcxx
 
 install-destdir=%(install_destdir)s
 
@@ -1152,10 +1173,6 @@ toolchain-benchmarks
 # If someone uses this for incremental builds, force reconfiguration.
 reconfigure
 
-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
-llvm-install-components=llvm-cov;llvm-profdata;IndexStore;clang;clang-headers;compiler-rt;clangd
-install-libcxx
-
 # Path to the .tar.gz package we would create.
 installable-package=%(installable_package)s
 
@@ -1327,13 +1344,16 @@ swift-stdlib-build-type=Release
 mixin-preset=
     buildbot_incremental_base_all_platforms
     lldb-smoketest,tools=RA
+    mixin_buildbot_install_components_with_clang
 
 build-subdir=buildbot_incremental
 
 # Build Release without debug info, because it is faster to build.
 release
 assertions
 
+libcxx
+
 # Build llbuild & swiftpm here
 llbuild
 swiftpm
@@ -1345,6 +1365,7 @@ sourcekit-lsp
 install-swift
 install-llbuild
 install-swiftpm
+install-libcxx
 
 # Build Playground support
 playgroundsupport
@@ -1391,14 +1412,18 @@ skip-test-osx
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_swiftpm_macos_platform,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=
+    buildbot_incremental_base
+    mixin_buildbot_install_components_with_clang
 
 build-subdir=buildbot_incremental
 
 # Build Release without debug info, because it is faster to build.
 release
 assertions
 
+libcxx
+
 # Build llbuild & swiftpm here
 llbuild
 swiftpm
@@ -1408,6 +1433,7 @@ sourcekit-lsp
 install-swift
 install-llbuild
 install-swiftpm
+install-libcxx
 
 dash-dash
 
@@ -1420,7 +1446,9 @@ skip-test-llbuild
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_swiftpm_linux_platform,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
+mixin-preset=
+    buildbot_incremental_base
+    mixin_linux_install_components_with_clang
 
 build-subdir=buildbot_incremental
 
@@ -1434,6 +1462,7 @@ xctest
 foundation
 libdispatch
 llbuild
+libcxx
 sourcekit-lsp
 
 install-swift
@@ -1442,6 +1471,7 @@ install-swiftpm
 install-foundation
 install-libdispatch
 install-xctest
+install-libcxx
 
 skip-test-swift
 skip-test-cmark
@@ -1484,6 +1514,7 @@ build-subdir=buildbot_incremental
 release
 assertions
 
+libcxx
 llbuild
 swiftpm
 indexstore-db
@@ -1492,22 +1523,27 @@ sourcekit-lsp
 install-swift
 install-llbuild
 install-swiftpm
+install-libcxx
 
 skip-test-swift
 skip-test-cmark
 skip-test-llbuild
 skip-test-swiftpm
 
 [preset: buildbot_swiftpm_package_macos]
-mixin-preset=buildbot_swiftpm_package_base
+mixin-preset=
+    buildbot_swiftpm_package_base
+    mixin_buildbot_install_components_with_clang
 
 # Build stdlib for all platforms.
 ios
 tvos
 watchos
 
 [preset: buildbot_swiftpm_package_linux]
-mixin-preset=buildbot_swiftpm_package_base
+mixin-preset=
+    buildbot_swiftpm_package_base
+    mixin_linux_install_components_with_clang
 
 libdispatch
 foundation