Skip to content

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

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 2 commits into from
Aug 1, 2019
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
284650b
[presets] Add clang install to bots that test indexstore-db/sourcekit…
benlangmuir Jul 23, 2019
218ecfb
Add libcxx to match install-libcxx
benlangmuir Jul 23, 2019
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
62 changes: 49 additions & 13 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -322,14 +325,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
Expand All @@ -351,6 +358,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
Expand Down Expand Up @@ -518,6 +526,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.
Expand All @@ -544,13 +553,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
Expand Down Expand Up @@ -717,8 +728,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
Expand All @@ -736,8 +753,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
Expand Down Expand Up @@ -993,9 +1008,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
Expand All @@ -1013,6 +1031,7 @@ install-swiftpm
install-foundation
install-libdispatch
install-xctest
install-libcxx

[preset: buildbot_incremental_linux,long_test]
mixin-preset=buildbot_incremental_linux
Expand Down Expand Up @@ -1104,6 +1123,7 @@ sourcekit-lsp=0
# OS X Package Builders
#===------------------------------------------------------------------------===#
[preset: mixin_osx_package_base]
mixin-preset=mixin_buildbot_install_components_with_clang
ios
tvos
watchos
Expand Down Expand Up @@ -1143,6 +1163,7 @@ skip-install-swiftsyntax-module
install-skstresstester
install-swiftevolve
install-playgroundsupport
install-libcxx

install-destdir=%(install_destdir)s

Expand All @@ -1166,10 +1187,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

Expand Down Expand Up @@ -1345,13 +1362,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
Expand All @@ -1363,6 +1383,7 @@ sourcekit-lsp
install-swift
install-llbuild
install-swiftpm
install-libcxx

# Build Playground support
playgroundsupport
Expand Down Expand Up @@ -1409,14 +1430,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
Expand All @@ -1426,6 +1451,7 @@ sourcekit-lsp
install-swift
install-llbuild
install-swiftpm
install-libcxx

dash-dash

Expand All @@ -1438,7 +1464,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

Expand All @@ -1452,6 +1480,7 @@ xctest
foundation
libdispatch
llbuild
libcxx
sourcekit-lsp

install-swift
Expand All @@ -1460,6 +1489,7 @@ install-swiftpm
install-foundation
install-libdispatch
install-xctest
install-libcxx

skip-test-swift
skip-test-cmark
Expand Down Expand Up @@ -1502,6 +1532,7 @@ build-subdir=buildbot_incremental
release
assertions

libcxx
llbuild
swiftpm
indexstore-db
Expand All @@ -1510,22 +1541,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
Expand Down