Skip to content

Re-work the mixins for swiftpm and downstream packages #79380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Re-work the mixins for swiftpm and downstream packages #79380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1827,8 +1827,11 @@ skip-test-foundation
#===------------------------------------------------------------------------===#
# Mixins for LLBuild, SwiftPM and downstream package project PR tests.
#===------------------------------------------------------------------------===#
# Base of SwiftPM and packages
[preset: mixin_swiftpm_base]
mixin-preset=buildbot_incremental_base
mixin-preset=
buildbot_incremental_base
mixin_buildbot_install_components_with_clang
build-subdir=buildbot_incremental

libcxx
Expand All @@ -1846,18 +1849,17 @@ swift-testing-macros
install-swift-testing
install-swift-testing-macros

infer-cross-compile-hosts-on-darwin
skip-test-swift

# SwiftPM base
[preset: mixin_swiftpm_macos_platform]
mixin-preset=
mixin_swiftpm_base
mixin_buildbot_install_components_with_clang
mixin-preset=mixin_swiftpm_base

infer-cross-compile-hosts-on-darwin

# SwiftPM base
[preset: mixin_swiftpm_linux_platform]
mixin-preset=
mixin_swiftpm_base
mixin_linux_install_components_with_clang
mixin-preset=mixin_swiftpm_base

libdispatch
foundation
Expand All @@ -1875,9 +1877,9 @@ skip-test-xctest
llvm-cmake-options=
-DCLANG_DEFAULT_LINKER=gold

# Builds enough of the toolchain to build a swift package on macOS.
# SwiftPM package base
[preset: mixin_swiftpm_package_macos_platform]
mixin-preset=mixin_swiftpm_macos_platform
mixin-preset=mixin_swiftpm_base

# We don't need to build the benchmark if we just want SwiftPM
skip-build-benchmarks
Expand All @@ -1890,10 +1892,22 @@ skip-watchos
skip-test-llbuild
skip-test-swiftpm

# Builds enough of the toolchain to build a swift package on Linux.
# SwiftPM package base
[preset: mixin_swiftpm_package_linux_platform]
mixin-preset=mixin_swiftpm_linux_platform
mixin-preset=mixin_swiftpm_base

libdispatch
foundation
xctest
libcxx=false

install-foundation
install-libdispatch
install-xctest

skip-test-foundation
skip-test-libdispatch
skip-test-xctest
skip-test-llbuild
skip-test-swiftpm

Expand Down