Skip to content

Commit 6a8ad4b

Browse files
committed
[build] Remove swiftevolve
swift-evolve hasn’t been used in the recent past. @beccadax and I agreed that it doesn’t provide any value anymore to keep swift-evolve around. In Becca’s words: > The resilience implementation is pretty stable at this point, and it never seems to have had many of the bugs that swift-evolve would have been able to shake out.
1 parent 1560e08 commit 6a8ad4b

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
@@ -374,7 +374,6 @@ swiftsyntax
374374
swiftformat
375375

376376
skstresstester
377-
swiftevolve
378377

379378
# Build Playground support
380379
playgroundsupport
@@ -563,7 +562,6 @@ skip-test-cmark
563562
skip-test-playgroundsupport
564563
skip-test-swiftsyntax
565564
skip-test-skstresstester
566-
skip-test-swiftevolve
567565
indexstore-db=0
568566
sourcekit-lsp=0
569567

@@ -1449,7 +1447,6 @@ skip-test-playgroundsupport
14491447
skip-test-swiftsyntax
14501448
skip-test-swiftformat
14511449
skip-test-skstresstester
1452-
skip-test-swiftevolve
14531450
skip-test-swiftdocc
14541451

14551452
[preset: buildbot_osx_package,no_assertions,no_test,use_os_runtime]
@@ -1489,7 +1486,6 @@ skip-test-playgroundsupport
14891486
skip-test-swiftsyntax
14901487
skip-test-swiftformat
14911488
skip-test-skstresstester
1492-
skip-test-swiftevolve
14931489
skip-test-swiftdocc
14941490

14951491
# macOS package with out test
@@ -1654,9 +1650,8 @@ install-swiftsyntax
16541650
install-libcxx
16551651
install-swiftdocc
16561652

1657-
# Build the stress tester and SwiftEvolve
1653+
# Build the stress tester
16581654
skstresstester
1659-
swiftevolve
16601655

16611656
# Build Playground support
16621657
playgroundsupport
@@ -1884,7 +1879,6 @@ swiftsyntax-verify-generated-files
18841879
swiftsyntax-lint
18851880
swiftformat
18861881
skstresstester
1887-
swiftevolve
18881882
sourcekit-lsp
18891883
skip-test-swift=false
18901884

@@ -1927,9 +1921,7 @@ mixin-preset=mixin_swiftpm_package_macos_platform
19271921
release
19281922
assertions
19291923
skstresstester
1930-
swiftevolve
19311924
install-skstresstester
1932-
install-swiftevolve
19331925

19341926
#===------------------------------------------------------------------------===#
19351927
# 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'],
@@ -1241,8 +1235,6 @@ def create_argument_parser():
12411235
help='skip testing the SourceKit Stress tester')
12421236
option('--skip-test-swiftformat', toggle_false('test_swiftformat'),
12431237
help='skip testing swift-format')
1244-
option('--skip-test-swiftevolve', toggle_false('test_swiftevolve'),
1245-
help='skip testing SwiftEvolve')
12461238
option('--skip-test-toolchain-benchmarks',
12471239
toggle_false('test_toolchainbenchmarks'),
12481240
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,
@@ -290,7 +288,6 @@
290288
'test_sourcekitlsp': False,
291289
'test_skstresstester': False,
292290
'test_swiftformat': False,
293-
'test_swiftevolve': False,
294291
'test_swiftdocc': False,
295292
'test_toolchainbenchmarks': False,
296293
'tvos': False,
@@ -541,7 +538,6 @@ class BuildScriptImplOption(_BaseOption):
541538
SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'),
542539
SetTrueOption('--skstresstester', dest='build_skstresstester'),
543540
SetTrueOption('--swiftformat', dest='build_swiftformat'),
544-
SetTrueOption('--swiftevolve', dest='build_swiftevolve'),
545541
SetTrueOption('--swiftdocc', dest='build_swiftdocc'),
546542
SetTrueOption('--build-minimal-stdlib', dest='build_minimalstdlib'),
547543
SetTrueOption('-B', dest='benchmark'),
@@ -621,7 +617,6 @@ class BuildScriptImplOption(_BaseOption):
621617
EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
622618
EnableOption('--install-swiftformat', dest='install_swiftformat'),
623619
EnableOption('--install-skstresstester', dest='install_skstresstester'),
624-
EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
625620
EnableOption('--install-swiftdocc', dest='install_swiftdocc'),
626621
EnableOption('--toolchain-benchmarks', dest='build_toolchainbenchmarks'),
627622
EnableOption('--swift-inspect', dest='build_swift_inspect'),
@@ -704,7 +699,6 @@ class BuildScriptImplOption(_BaseOption):
704699
DisableOption('--skip-test-sourcekit-lsp', dest='test_sourcekitlsp'),
705700
DisableOption('--skip-test-skstresstester', dest='test_skstresstester'),
706701
DisableOption('--skip-test-swiftformat', dest='test_swiftformat'),
707-
DisableOption('--skip-test-swiftevolve', dest='test_swiftevolve'),
708702
DisableOption('--skip-test-swiftdocc', dest='test_swiftdocc'),
709703
DisableOption('--skip-test-toolchain-benchmarks',
710704
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
@@ -65,7 +64,6 @@
6564
'XCTest',
6665
'SwiftSyntax',
6766
'SKStressTester',
68-
'SwiftEvolve',
6967
'IndexStoreDB',
7068
'SourceKitLSP',
7169
'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)