Skip to content

Commit 9c1bc85

Browse files
committed
[build] Install swift-format in all jobs that test sourcekit-lsp
With swiftlang/sourcekit-lsp#769, sourcekit-lsp supports formatting that invokes swift-format from the toolchain and tests that test this behavior. For those to pass, we need to install swift-format into the toolchain on all jobs that test sourcekit-lsp.
1 parent acf4e28 commit 9c1bc85

File tree

1 file changed

+27
-0
lines changed

1 file changed

+27
-0
lines changed

utils/build-presets.ini

Lines changed: 27 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
@@ -872,6 +874,7 @@ lldb-test-swift-only
872874

873875
install-foundation
874876
install-libdispatch
877+
install-swiftformat
875878
reconfigure
876879

877880
# gcc version on amazon linux 2 is too old to configure and build tablegen.
@@ -1039,6 +1042,7 @@ lit-args=-v
10391042

10401043
install-foundation
10411044
install-libdispatch
1045+
install-swiftformat
10421046
reconfigure
10431047
test-optimized
10441048

@@ -1148,6 +1152,7 @@ install-swiftsyntax
11481152
install-foundation
11491153
install-libdispatch
11501154
install-xctest
1155+
install-swiftformat
11511156

11521157
[preset: buildbot_incremental_linux,long_test]
11531158
mixin-preset=buildbot_incremental_linux
@@ -1311,6 +1316,7 @@ install-playgroundsupport
13111316
install-sourcekit-lsp
13121317
install-swiftformat
13131318
install-swiftdocc
1319+
install-swiftformat
13141320

13151321
install-destdir=%(install_destdir)s
13161322

@@ -1625,6 +1631,7 @@ install-swiftpm
16251631
install-swift-driver
16261632
install-swiftsyntax
16271633
install-swiftdocc
1634+
install-swiftformat
16281635

16291636
# Build the stress tester
16301637
skstresstester
@@ -1776,6 +1783,8 @@ assertions
17761783

17771784
# Downstream projects that import llbuild+SwiftPM.
17781785
sourcekit-lsp
1786+
swiftformat
1787+
install-swiftformat
17791788

17801789
toolchain-benchmarks
17811790
skip-test-toolchain-benchmarks
@@ -1795,6 +1804,8 @@ assertions
17951804

17961805
# Downstream projects that import llbuild+SwiftPM.
17971806
sourcekit-lsp
1807+
swiftformat
1808+
install-swiftformat
17981809

17991810
toolchain-benchmarks
18001811
skip-test-toolchain-benchmarks
@@ -1816,6 +1827,8 @@ assertions
18161827

18171828
# Downstream projects that import llbuild+SwiftPM.
18181829
sourcekit-lsp
1830+
swiftformat
1831+
install-swiftformat
18191832

18201833
#===------------------------------------------------------------------------===#
18211834
# Test llbuild on Linux builder
@@ -1830,6 +1843,8 @@ assertions
18301843

18311844
# Downstream projects that import llbuild+SwiftPM.
18321845
sourcekit-lsp
1846+
swiftformat
1847+
install-swiftformat
18331848

18341849
#===------------------------------------------------------------------------===#
18351850
# Test Swift Driver (new)
@@ -1863,6 +1878,7 @@ swiftsyntax-lint
18631878
swiftformat
18641879
skstresstester
18651880
sourcekit-lsp
1881+
install-swiftformat
18661882
skip-test-swift=false
18671883

18681884
[preset: buildbot_swiftsyntax_linux]
@@ -1874,6 +1890,7 @@ swiftsyntax-enable-rawsyntax-validation
18741890
swiftsyntax-enable-test-fuzzing
18751891
sourcekit-lsp
18761892
swiftformat
1893+
install-swiftformat
18771894

18781895
#===------------------------------------------------------------------------===#
18791896
# Test Swift Format
@@ -1885,6 +1902,7 @@ release
18851902
assertions
18861903
swiftsyntax
18871904
swiftformat
1905+
install-swiftformat
18881906
swiftsyntax-lint
18891907
sourcekit-lsp-lint
18901908

@@ -1917,13 +1935,16 @@ release
19171935
assertions
19181936
sourcekit-lsp
19191937
swiftformat
1938+
install-swiftformat
19201939
sourcekit-lsp-lint
19211940

19221941
[preset: buildbot_sourcekitlsp_linux,no_sanitize]
19231942
mixin-preset=mixin_swiftpm_package_linux_platform
19241943
release
19251944
assertions
19261945
sourcekit-lsp
1946+
swiftformat
1947+
install-swiftformat
19271948

19281949
[preset: buildbot_sourcekitlsp_macos,sanitize]
19291950
mixin-preset=buildbot_sourcekitlsp_macos,no_sanitize
@@ -1951,13 +1972,17 @@ release
19511972
assertions
19521973
indexstore-db
19531974
sourcekit-lsp
1975+
swiftformat
1976+
install-swiftformat
19541977

19551978
[preset: buildbot_indexstoredb_linux,no_sanitize]
19561979
mixin-preset=mixin_swiftpm_package_linux_platform
19571980
release
19581981
assertions
19591982
indexstore-db
19601983
sourcekit-lsp
1984+
swiftformat
1985+
install-swiftformat
19611986

19621987
[preset: buildbot_indexstoredb_macos,sanitize]
19631988
mixin-preset=buildbot_indexstoredb_macos,no_sanitize
@@ -1991,6 +2016,7 @@ foundation
19912016
libdispatch
19922017
indexstore-db
19932018
sourcekit-lsp
2019+
swiftformat
19942020

19952021
release
19962022
validation-test
@@ -2007,6 +2033,7 @@ install-swiftpm
20072033
install-swiftsyntax
20082034
install-xctest
20092035
install-sourcekit-lsp
2036+
install-swiftformat
20102037

20112038
skip-test-cmark
20122039
skip-test-swift

0 commit comments

Comments
 (0)