Skip to content

Commit 12b5008

Browse files
authored
Merge pull request #69388 from ahoppen/ahoppen/remove-swiftevolve
[build] Remove swiftevolve
2 parents 1611ca0 + 6a8ad4b commit 12b5008

File tree

8 files changed

+1
-92
lines changed

8 files changed

+1
-92
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@
209209
/utils/swift_build_support/products/earlyswiftsyntax.py @ahoppen @bnbarham
210210
/utils/swift_build_support/products/skstresstester.py @ahoppen @bnbarham
211211
/utils/swift_build_support/products/sourcekitlsp.py @ahoppen @bnbarham
212-
/utils/swift_build_support/products/swiftevolve.py @ahoppen @bnbarham
213212
/utils/swift_build_support/products/swiftformat.py @ahoppen @allevato @bnbarham
214213
/utils/swift_build_support/products/swiftsyntax.py @ahoppen @bnbarham
215214
/utils/update-checkout* @shahmishal

utils/build-presets.ini

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,6 @@ swiftsyntax
379379
swiftformat
380380

381381
skstresstester
382-
swiftevolve
383382

384383
# Build Playground support
385384
playgroundsupport
@@ -544,7 +543,6 @@ skip-test-llbuild
544543
skip-test-playgroundsupport
545544
skip-test-swiftsyntax
546545
skip-test-skstresstester
547-
skip-test-swiftevolve
548546
indexstore-db=0
549547
sourcekit-lsp=0
550548

@@ -1425,7 +1423,6 @@ skip-test-playgroundsupport
14251423
skip-test-swiftsyntax
14261424
skip-test-swiftformat
14271425
skip-test-skstresstester
1428-
skip-test-swiftevolve
14291426
skip-test-swiftdocc
14301427

14311428
[preset: buildbot_osx_package,no_assertions,no_test,use_os_runtime]
@@ -1465,7 +1462,6 @@ skip-test-playgroundsupport
14651462
skip-test-swiftsyntax
14661463
skip-test-swiftformat
14671464
skip-test-skstresstester
1468-
skip-test-swiftevolve
14691465
skip-test-swiftdocc
14701466

14711467
# macOS package with out test
@@ -1630,9 +1626,8 @@ install-swiftsyntax
16301626
install-libcxx
16311627
install-swiftdocc
16321628

1633-
# Build the stress tester and SwiftEvolve
1629+
# Build the stress tester
16341630
skstresstester
1635-
swiftevolve
16361631

16371632
# Build Playground support
16381633
playgroundsupport
@@ -1859,7 +1854,6 @@ swiftsyntax-verify-generated-files
18591854
swiftsyntax-lint
18601855
swiftformat
18611856
skstresstester
1862-
swiftevolve
18631857
sourcekit-lsp
18641858
skip-test-swift=false
18651859

@@ -1902,9 +1896,7 @@ mixin-preset=mixin_swiftpm_package_macos_platform
19021896
release
19031897
assertions
19041898
skstresstester
1905-
swiftevolve
19061899
install-skstresstester
1907-
install-swiftevolve
19081900

19091901
#===------------------------------------------------------------------------===#
19101902
# Test SourceKit-LSP

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ def _apply_default_arguments(args):
208208
args.test_sourcekitlsp = False
209209
args.test_skstresstester = False
210210
args.test_swiftformat = False
211-
args.test_swiftevolve = False
212211
args.test_toolchainbenchmarks = False
213212
args.test_swiftdocc = False
214213

@@ -688,9 +687,6 @@ def create_argument_parser():
688687
option(['--swiftformat'], toggle_true('build_swiftformat'),
689688
help='build swift-format')
690689

691-
option(['--swiftevolve'], toggle_true('build_swiftevolve'),
692-
help='build the swift-evolve tool')
693-
694690
option(['--swift-driver'], toggle_true('build_swift_driver'),
695691
help='build swift-driver')
696692
option(['--swiftdocc'], toggle_true('build_swiftdocc'),
@@ -735,8 +731,6 @@ def create_argument_parser():
735731
help='install the SourceKit stress tester')
736732
option(['--install-swift-driver'], toggle_true('install_swift_driver'),
737733
help='install new Swift driver')
738-
option(['--install-swiftevolve'], toggle_true('install_swiftevolve'),
739-
help='install SwiftEvolve')
740734
option(['--install-swiftdocc'], toggle_true('install_swiftdocc'),
741735
help='install Swift DocC')
742736
option(['--toolchain-benchmarks'],
@@ -1244,8 +1238,6 @@ def create_argument_parser():
12441238
help='skip testing the SourceKit Stress tester')
12451239
option('--skip-test-swiftformat', toggle_false('test_swiftformat'),
12461240
help='skip testing swift-format')
1247-
option('--skip-test-swiftevolve', toggle_false('test_swiftevolve'),
1248-
help='skip testing SwiftEvolve')
12491241
option('--skip-test-toolchain-benchmarks',
12501242
toggle_false('test_toolchainbenchmarks'),
12511243
help='skip testing toolchain benchmarks')

utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

utils/build_swift/tests/expected_options.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
'build_swiftsyntax': False,
9898
'build_skstresstester': False,
9999
'build_swiftformat': False,
100-
'build_swiftevolve': False,
101100
'build_swiftdocc': False,
102101
'build_minimalstdlib': False,
103102
'build_indexstoredb': False,
@@ -117,7 +116,6 @@
117116
'install_sourcekitlsp': False,
118117
'install_swiftformat': False,
119118
'install_skstresstester': False,
120-
'install_swiftevolve': False,
121119
'build_toolchainbenchmarks': False,
122120
'build_toolchain_only': False,
123121
'build_tvos': True,
@@ -291,7 +289,6 @@
291289
'test_sourcekitlsp': False,
292290
'test_skstresstester': False,
293291
'test_swiftformat': False,
294-
'test_swiftevolve': False,
295292
'test_swiftdocc': False,
296293
'test_toolchainbenchmarks': False,
297294
'test_wasmstdlib': True,
@@ -543,7 +540,6 @@ class BuildScriptImplOption(_BaseOption):
543540
SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'),
544541
SetTrueOption('--skstresstester', dest='build_skstresstester'),
545542
SetTrueOption('--swiftformat', dest='build_swiftformat'),
546-
SetTrueOption('--swiftevolve', dest='build_swiftevolve'),
547543
SetTrueOption('--swiftdocc', dest='build_swiftdocc'),
548544
SetTrueOption('--build-minimal-stdlib', dest='build_minimalstdlib'),
549545
SetTrueOption('--build-wasm-stdlib', dest='build_wasmstdlib'),
@@ -624,7 +620,6 @@ class BuildScriptImplOption(_BaseOption):
624620
EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
625621
EnableOption('--install-swiftformat', dest='install_swiftformat'),
626622
EnableOption('--install-skstresstester', dest='install_skstresstester'),
627-
EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
628623
EnableOption('--install-swiftdocc', dest='install_swiftdocc'),
629624
EnableOption('--toolchain-benchmarks', dest='build_toolchainbenchmarks'),
630625
EnableOption('--swift-inspect', dest='build_swift_inspect'),
@@ -707,7 +702,6 @@ class BuildScriptImplOption(_BaseOption):
707702
DisableOption('--skip-test-sourcekit-lsp', dest='test_sourcekitlsp'),
708703
DisableOption('--skip-test-skstresstester', dest='test_skstresstester'),
709704
DisableOption('--skip-test-swiftformat', dest='test_swiftformat'),
710-
DisableOption('--skip-test-swiftevolve', dest='test_swiftevolve'),
711705
DisableOption('--skip-test-swiftdocc', dest='test_swiftdocc'),
712706
DisableOption('--skip-test-toolchain-benchmarks',
713707
dest='test_toolchainbenchmarks'),

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,8 +646,6 @@ def compute_product_pipelines(self):
646646
is_enabled=self.args.build_swiftformat)
647647
builder.add_product(products.SKStressTester,
648648
is_enabled=self.args.build_skstresstester)
649-
builder.add_product(products.SwiftEvolve,
650-
is_enabled=self.args.build_swiftevolve)
651649
builder.add_product(products.IndexStoreDB,
652650
is_enabled=self.args.build_indexstoredb)
653651
builder.add_product(products.PlaygroundSupport,

utils/swift_build_support/swift_build_support/products/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
from .swiftdocc import SwiftDocC
3333
from .swiftdoccrender import SwiftDocCRender
3434
from .swiftdriver import SwiftDriver
35-
from .swiftevolve import SwiftEvolve
3635
from .swiftformat import SwiftFormat
3736
from .swiftinspect import SwiftInspect
3837
from .swiftpm import SwiftPM
@@ -67,7 +66,6 @@
6766
'XCTest',
6867
'SwiftSyntax',
6968
'SKStressTester',
70-
'SwiftEvolve',
7169
'IndexStoreDB',
7270
'SourceKitLSP',
7371
'Benchmarks',

utils/swift_build_support/swift_build_support/products/swiftevolve.py

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)