Skip to content

Commit 7b5fa6e

Browse files
authored
Merge pull request #71003 from ahoppen/ahoppen/install-swiftformat-for-lsp
[build] Install swift-format in all jobs that test sourcekit-lsp
2 parents a5f0fe7 + 7ec0fcf commit 7b5fa6e

File tree

1 file changed

+26
-0
lines changed

1 file changed

+26
-0
lines changed

utils/build-presets.ini

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ install-llbuild
396396
install-swiftpm
397397
install-swift-driver
398398
install-swiftsyntax
399+
install-swiftformat
399400

400401
[preset: buildbot_incremental,tools=RA,stdlib=RA,apple_silicon]
401402
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
@@ -603,6 +604,7 @@ install-llbuild
603604
install-swiftpm
604605
install-swiftsyntax
605606
install-swift-driver
607+
install-swiftformat
606608

607609
# We need to build the unittest extras so we can test
608610
build-swift-stdlib-unittest-extra
@@ -871,6 +873,7 @@ lldb-test-swift-only
871873

872874
install-foundation
873875
install-libdispatch
876+
install-swiftformat
874877
reconfigure
875878

876879
# gcc version on amazon linux 2 is too old to configure and build tablegen.
@@ -1041,6 +1044,7 @@ lit-args=-v
10411044

10421045
install-foundation
10431046
install-libdispatch
1047+
install-swiftformat
10441048
reconfigure
10451049
test-optimized
10461050

@@ -1150,6 +1154,7 @@ install-swiftsyntax
11501154
install-foundation
11511155
install-libdispatch
11521156
install-xctest
1157+
install-swiftformat
11531158

11541159
[preset: buildbot_incremental_linux,long_test]
11551160
mixin-preset=buildbot_incremental_linux
@@ -1627,6 +1632,7 @@ install-swiftpm
16271632
install-swift-driver
16281633
install-swiftsyntax
16291634
install-swiftdocc
1635+
install-swiftformat
16301636

16311637
# Build the stress tester
16321638
skstresstester
@@ -1778,6 +1784,8 @@ assertions
17781784

17791785
# Downstream projects that import llbuild+SwiftPM.
17801786
sourcekit-lsp
1787+
swiftformat
1788+
install-swiftformat
17811789

17821790
toolchain-benchmarks
17831791
skip-test-toolchain-benchmarks
@@ -1797,6 +1805,8 @@ assertions
17971805

17981806
# Downstream projects that import llbuild+SwiftPM.
17991807
sourcekit-lsp
1808+
swiftformat
1809+
install-swiftformat
18001810

18011811
toolchain-benchmarks
18021812
skip-test-toolchain-benchmarks
@@ -1816,6 +1826,8 @@ assertions
18161826

18171827
# Downstream projects that import llbuild+SwiftPM.
18181828
sourcekit-lsp
1829+
swiftformat
1830+
install-swiftformat
18191831

18201832
#===------------------------------------------------------------------------===#
18211833
# Test llbuild on Linux builder
@@ -1830,6 +1842,8 @@ assertions
18301842

18311843
# Downstream projects that import llbuild+SwiftPM.
18321844
sourcekit-lsp
1845+
swiftformat
1846+
install-swiftformat
18331847

18341848
#===------------------------------------------------------------------------===#
18351849
# Test Swift Driver (new)
@@ -1863,6 +1877,7 @@ swiftsyntax-lint
18631877
swiftformat
18641878
skstresstester
18651879
sourcekit-lsp
1880+
install-swiftformat
18661881
skip-test-swift=false
18671882

18681883
[preset: buildbot_swiftsyntax_linux]
@@ -1874,6 +1889,7 @@ swiftsyntax-enable-rawsyntax-validation
18741889
swiftsyntax-enable-test-fuzzing
18751890
sourcekit-lsp
18761891
swiftformat
1892+
install-swiftformat
18771893

18781894
#===------------------------------------------------------------------------===#
18791895
# Test Swift Format
@@ -1885,6 +1901,7 @@ release
18851901
assertions
18861902
swiftsyntax
18871903
swiftformat
1904+
install-swiftformat
18881905
swiftsyntax-lint
18891906
sourcekit-lsp-lint
18901907

@@ -1917,13 +1934,16 @@ release
19171934
assertions
19181935
sourcekit-lsp
19191936
swiftformat
1937+
install-swiftformat
19201938
sourcekit-lsp-lint
19211939

19221940
[preset: buildbot_sourcekitlsp_linux,no_sanitize]
19231941
mixin-preset=mixin_swiftpm_package_linux_platform
19241942
release
19251943
assertions
19261944
sourcekit-lsp
1945+
swiftformat
1946+
install-swiftformat
19271947

19281948
[preset: buildbot_sourcekitlsp_macos,sanitize]
19291949
mixin-preset=buildbot_sourcekitlsp_macos,no_sanitize
@@ -1951,13 +1971,17 @@ release
19511971
assertions
19521972
indexstore-db
19531973
sourcekit-lsp
1974+
swiftformat
1975+
install-swiftformat
19541976

19551977
[preset: buildbot_indexstoredb_linux,no_sanitize]
19561978
mixin-preset=mixin_swiftpm_package_linux_platform
19571979
release
19581980
assertions
19591981
indexstore-db
19601982
sourcekit-lsp
1983+
swiftformat
1984+
install-swiftformat
19611985

19621986
[preset: buildbot_indexstoredb_macos,sanitize]
19631987
mixin-preset=buildbot_indexstoredb_macos,no_sanitize
@@ -1991,6 +2015,7 @@ foundation
19912015
libdispatch
19922016
indexstore-db
19932017
sourcekit-lsp
2018+
swiftformat
19942019

19952020
release
19962021
validation-test
@@ -2007,6 +2032,7 @@ install-swiftpm
20072032
install-swiftsyntax
20082033
install-xctest
20092034
install-sourcekit-lsp
2035+
install-swiftformat
20102036

20112037
skip-test-cmark
20122038
skip-test-swift

0 commit comments

Comments
 (0)