[preset] Factor swiftpm and downstream presets

Factor out the common configuration between the SwiftPM preset and
downstream package presets. This is a win in itself, but it also helps
prepare for making the llbuild jobs build downstream packages in a
future commit.

Author: benlangmuir

utils/build-presets.ini

@@ -1386,103 +1386,103 @@ skip-test-osx
 
 
 #===------------------------------------------------------------------------===#
-# Test swiftPM on macOS builder
+# Mixins for LLBuild, SwiftPM and downstream package project PR tests.
 #===------------------------------------------------------------------------===#
-
-[preset: buildbot_swiftpm_macos_platform,tools=RA,stdlib=RA]
-mixin-preset=
-    buildbot_incremental_base
-    mixin_buildbot_install_components_with_clang
-
+[preset: mixin_swiftpm_base]
+mixin-preset=buildbot_incremental_base
 build-subdir=buildbot_incremental
 
-# Build Release without debug info, because it is faster to build.
-release
-assertions
-
 libcxx
-
-# Build llbuild & swiftpm here
 llbuild
 swiftpm
 
-sourcekit-lsp
-
 install-swift
 install-llbuild
 install-swiftpm
 install-libcxx
 
-dash-dash
-
 skip-test-swift
 skip-test-cmark
-skip-test-llbuild
 
-#===------------------------------------------------------------------------===#
-# Test swiftPM on Linux builder
-#===------------------------------------------------------------------------===#
+[preset: mixin_swiftpm_macos_platform]
+mixin-preset=
+    mixin_swiftpm_base
+    mixin_buildbot_install_components_with_clang
 
-[preset: buildbot_swiftpm_linux_platform,tools=RA,stdlib=RA]
+[preset: mixin_swiftpm_linux_platform]
 mixin-preset=
-    buildbot_incremental_base
+    mixin_swiftpm_base
     mixin_linux_install_components_with_clang
 
-build-subdir=buildbot_incremental
-
-# Build Release without debug info, because it is faster to build.
-release
-assertions
-
-swiftpm
-
-xctest
-foundation
 libdispatch
-llbuild
-libcxx
-sourcekit-lsp
+foundation
+xctest
 
-install-swift
-install-llbuild
-install-swiftpm
 install-foundation
 install-libdispatch
 install-xctest
-install-libcxx
 
-skip-test-swift
-skip-test-cmark
-skip-test-llbuild
-skip-test-libdispatch
 skip-test-foundation
+skip-test-libdispatch
 skip-test-xctest
 
+# Builds enough of the the toolchain to build a swift pacakge on macOS.
+[preset: mixin_swiftpm_package_macos_platform]
+mixin-preset=mixin_swiftpm_macos_platform
+
+# Build stdlib for all platforms.
+ios
+tvos
+watchos
+
+skip-test-llbuild
+skip-test-swiftpm
+
+# Builds enough of the the toolchain to build a swift pacakge on Linux.
+[preset: mixin_swiftpm_package_linux_platform]
+mixin-preset=mixin_swiftpm_linux_platform
+
+skip-test-llbuild
+skip-test-swiftpm
+
+
 #===------------------------------------------------------------------------===#
-# Test llbuild on macOS builder
+# Test swiftPM on macOS builder
 #===------------------------------------------------------------------------===#
 
-[preset: buildbot_llbuild_macos_platform,tools=RA,stdlib=RA]
-mixin-preset=buildbot_incremental_base
+[preset: buildbot_swiftpm_macos_platform,tools=RA,stdlib=RA]
+mixin-preset=mixin_swiftpm_macos_platform
 
-build-subdir=buildbot_incremental
+# Build Release without debug info, because it is faster to build.
+release
+assertions
+
+# Downstream projects that import llbuild+SwiftPM.
+sourcekit-lsp
+
+skip-test-llbuild
+
+#===------------------------------------------------------------------------===#
+# Test swiftPM on Linux builder
+#===------------------------------------------------------------------------===#
+
+[preset: buildbot_swiftpm_linux_platform,tools=RA,stdlib=RA]
+mixin-preset=mixin_swiftpm_linux_platform
 
 # Build Release without debug info, because it is faster to build.
 release
 assertions
 
-# Build llbuild & swiftpm here
-llbuild
-swiftpm
+# Downstream projects that import llbuild+SwiftPM.
+sourcekit-lsp
 
-skip-test-swift
-skip-test-cmark
+skip-test-llbuild
 
 #===------------------------------------------------------------------------===#
-# Test llbuild on Linux builder
+# Test llbuild on macOS builder
 #===------------------------------------------------------------------------===#
 
-[preset: buildbot_llbuild_linux_platform,tools=RA,stdlib=RA]
+[preset: buildbot_llbuild_macos_platform,tools=RA,stdlib=RA]
 mixin-preset=buildbot_incremental_base
 
 build-subdir=buildbot_incremental
@@ -1495,67 +1495,32 @@ assertions
 llbuild
 swiftpm
 
-xctest
-foundation
-llbuild
-
 skip-test-swift
 skip-test-cmark
-skip-test-foundation
-skip-test-libdispatch
-skip-test-xctest
 
 #===------------------------------------------------------------------------===#
-# Test Swift Packages
+# Test llbuild on Linux builder
 #===------------------------------------------------------------------------===#
 
-[preset: buildbot_swiftpm_package_base]
+[preset: buildbot_llbuild_linux_platform,tools=RA,stdlib=RA]
 mixin-preset=buildbot_incremental_base
 
 build-subdir=buildbot_incremental
 
+# Build Release without debug info, because it is faster to build.
 release
 assertions
 
-libcxx
+# Build llbuild & swiftpm here
 llbuild
 swiftpm
-indexstore-db
-sourcekit-lsp
 
-install-swift
-install-llbuild
-install-swiftpm
-install-libcxx
+xctest
+foundation
+llbuild
 
 skip-test-swift
 skip-test-cmark
-skip-test-llbuild
-skip-test-swiftpm
-
-[preset: buildbot_swiftpm_package_macos]
-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_linux_install_components_with_clang
-
-libdispatch
-foundation
-xctest
-
-install-foundation
-install-libdispatch
-install-xctest
-
 skip-test-foundation
 skip-test-libdispatch
 skip-test-xctest
@@ -1565,28 +1530,32 @@ skip-test-xctest
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_sourcekitlsp_macos]
-mixin-preset=buildbot_swiftpm_package_macos
-
+mixin-preset=mixin_swiftpm_package_macos_platform
+release
+assertions
 sourcekit-lsp
 
 [preset: buildbot_sourcekitlsp_linux]
-mixin-preset=buildbot_swiftpm_package_linux
-
+mixin-preset=mixin_swiftpm_package_linux_platform
+release
+assertions
 sourcekit-lsp
 
 #===------------------------------------------------------------------------===#
 # Test IndexStore-DB
 #===------------------------------------------------------------------------===#
 
 [preset: buildbot_indexstoredb_macos]
-mixin-preset=buildbot_swiftpm_package_macos
-
+mixin-preset=mixin_swiftpm_package_macos_platform
+release
+assertions
 indexstore-db
 sourcekit-lsp
 
 [preset: buildbot_indexstoredb_linux]
-mixin-preset=buildbot_swiftpm_package_linux
-
+mixin-preset=mixin_swiftpm_package_linux_platform
+release
+assertions
 indexstore-db
 sourcekit-lsp