From 6a8ad4b91e0d0d59af7e640b719ba8fcb4dde2d5 Mon Sep 17 00:00:00 2001 From: Alex Hoppen Date: Tue, 24 Oct 2023 18:36:44 -0700 Subject: [PATCH] [build] Remove swiftevolve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .github/CODEOWNERS | 1 - utils/build-presets.ini | 10 +-- .../build_swift/driver_arguments.py | 8 --- .../contents.xcworkspacedata | 1 - utils/build_swift/tests/expected_options.py | 6 -- .../build_script_invocation.py | 2 - .../swift_build_support/products/__init__.py | 2 - .../products/swiftevolve.py | 63 ------------------- 8 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 utils/swift_build_support/swift_build_support/products/swiftevolve.py diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7cce4a3c37ef5..d414f75fa7ffd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -209,7 +209,6 @@ /utils/swift_build_support/products/earlyswiftsyntax.py @ahoppen @bnbarham /utils/swift_build_support/products/skstresstester.py @ahoppen @bnbarham /utils/swift_build_support/products/sourcekitlsp.py @ahoppen @bnbarham -/utils/swift_build_support/products/swiftevolve.py @ahoppen @bnbarham /utils/swift_build_support/products/swiftformat.py @ahoppen @allevato @bnbarham /utils/swift_build_support/products/swiftsyntax.py @ahoppen @bnbarham /utils/update-checkout* @shahmishal diff --git a/utils/build-presets.ini b/utils/build-presets.ini index bd3a312ae177f..ebcd14b330acc 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -374,7 +374,6 @@ swiftsyntax swiftformat skstresstester -swiftevolve # Build Playground support playgroundsupport @@ -563,7 +562,6 @@ skip-test-cmark skip-test-playgroundsupport skip-test-swiftsyntax skip-test-skstresstester -skip-test-swiftevolve indexstore-db=0 sourcekit-lsp=0 @@ -1449,7 +1447,6 @@ skip-test-playgroundsupport skip-test-swiftsyntax skip-test-swiftformat skip-test-skstresstester -skip-test-swiftevolve skip-test-swiftdocc [preset: buildbot_osx_package,no_assertions,no_test,use_os_runtime] @@ -1489,7 +1486,6 @@ skip-test-playgroundsupport skip-test-swiftsyntax skip-test-swiftformat skip-test-skstresstester -skip-test-swiftevolve skip-test-swiftdocc # macOS package with out test @@ -1654,9 +1650,8 @@ install-swiftsyntax install-libcxx install-swiftdocc -# Build the stress tester and SwiftEvolve +# Build the stress tester skstresstester -swiftevolve # Build Playground support playgroundsupport @@ -1884,7 +1879,6 @@ swiftsyntax-verify-generated-files swiftsyntax-lint swiftformat skstresstester -swiftevolve sourcekit-lsp skip-test-swift=false @@ -1927,9 +1921,7 @@ mixin-preset=mixin_swiftpm_package_macos_platform release assertions skstresstester -swiftevolve install-skstresstester -install-swiftevolve #===------------------------------------------------------------------------===# # Test SourceKit-LSP diff --git a/utils/build_swift/build_swift/driver_arguments.py b/utils/build_swift/build_swift/driver_arguments.py index 15f2ff04f4340..fe6dfa96d473f 100644 --- a/utils/build_swift/build_swift/driver_arguments.py +++ b/utils/build_swift/build_swift/driver_arguments.py @@ -208,7 +208,6 @@ def _apply_default_arguments(args): args.test_sourcekitlsp = False args.test_skstresstester = False args.test_swiftformat = False - args.test_swiftevolve = False args.test_toolchainbenchmarks = False args.test_swiftdocc = False @@ -688,9 +687,6 @@ def create_argument_parser(): option(['--swiftformat'], toggle_true('build_swiftformat'), help='build swift-format') - option(['--swiftevolve'], toggle_true('build_swiftevolve'), - help='build the swift-evolve tool') - option(['--swift-driver'], toggle_true('build_swift_driver'), help='build swift-driver') option(['--swiftdocc'], toggle_true('build_swiftdocc'), @@ -735,8 +731,6 @@ def create_argument_parser(): help='install the SourceKit stress tester') option(['--install-swift-driver'], toggle_true('install_swift_driver'), help='install new Swift driver') - option(['--install-swiftevolve'], toggle_true('install_swiftevolve'), - help='install SwiftEvolve') option(['--install-swiftdocc'], toggle_true('install_swiftdocc'), help='install Swift DocC') option(['--toolchain-benchmarks'], @@ -1241,8 +1235,6 @@ def create_argument_parser(): help='skip testing the SourceKit Stress tester') option('--skip-test-swiftformat', toggle_false('test_swiftformat'), help='skip testing swift-format') - option('--skip-test-swiftevolve', toggle_false('test_swiftevolve'), - help='skip testing SwiftEvolve') option('--skip-test-toolchain-benchmarks', toggle_false('test_toolchainbenchmarks'), help='skip testing toolchain benchmarks') diff --git a/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata b/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata index a9793945a9cbd..98690cb842e09 100644 --- a/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata +++ b/utils/build_swift/resources/SwiftPM-Unified-Build.xcworkspace/contents.xcworkspacedata @@ -11,7 +11,6 @@ - diff --git a/utils/build_swift/tests/expected_options.py b/utils/build_swift/tests/expected_options.py index deacbc60e9c72..a8501ed92858f 100644 --- a/utils/build_swift/tests/expected_options.py +++ b/utils/build_swift/tests/expected_options.py @@ -97,7 +97,6 @@ 'build_swiftsyntax': False, 'build_skstresstester': False, 'build_swiftformat': False, - 'build_swiftevolve': False, 'build_swiftdocc': False, 'build_minimalstdlib': False, 'build_indexstoredb': False, @@ -117,7 +116,6 @@ 'install_sourcekitlsp': False, 'install_swiftformat': False, 'install_skstresstester': False, - 'install_swiftevolve': False, 'build_toolchainbenchmarks': False, 'build_toolchain_only': False, 'build_tvos': True, @@ -290,7 +288,6 @@ 'test_sourcekitlsp': False, 'test_skstresstester': False, 'test_swiftformat': False, - 'test_swiftevolve': False, 'test_swiftdocc': False, 'test_toolchainbenchmarks': False, 'tvos': False, @@ -541,7 +538,6 @@ class BuildScriptImplOption(_BaseOption): SetTrueOption('--swiftsyntax', dest='build_swiftsyntax'), SetTrueOption('--skstresstester', dest='build_skstresstester'), SetTrueOption('--swiftformat', dest='build_swiftformat'), - SetTrueOption('--swiftevolve', dest='build_swiftevolve'), SetTrueOption('--swiftdocc', dest='build_swiftdocc'), SetTrueOption('--build-minimal-stdlib', dest='build_minimalstdlib'), SetTrueOption('-B', dest='benchmark'), @@ -621,7 +617,6 @@ class BuildScriptImplOption(_BaseOption): EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'), EnableOption('--install-swiftformat', dest='install_swiftformat'), EnableOption('--install-skstresstester', dest='install_skstresstester'), - EnableOption('--install-swiftevolve', dest='install_swiftevolve'), EnableOption('--install-swiftdocc', dest='install_swiftdocc'), EnableOption('--toolchain-benchmarks', dest='build_toolchainbenchmarks'), EnableOption('--swift-inspect', dest='build_swift_inspect'), @@ -704,7 +699,6 @@ class BuildScriptImplOption(_BaseOption): DisableOption('--skip-test-sourcekit-lsp', dest='test_sourcekitlsp'), DisableOption('--skip-test-skstresstester', dest='test_skstresstester'), DisableOption('--skip-test-swiftformat', dest='test_swiftformat'), - DisableOption('--skip-test-swiftevolve', dest='test_swiftevolve'), DisableOption('--skip-test-swiftdocc', dest='test_swiftdocc'), DisableOption('--skip-test-toolchain-benchmarks', dest='test_toolchainbenchmarks'), diff --git a/utils/swift_build_support/swift_build_support/build_script_invocation.py b/utils/swift_build_support/swift_build_support/build_script_invocation.py index 9fae17b321fec..0991d7cdf5054 100644 --- a/utils/swift_build_support/swift_build_support/build_script_invocation.py +++ b/utils/swift_build_support/swift_build_support/build_script_invocation.py @@ -646,8 +646,6 @@ def compute_product_pipelines(self): is_enabled=self.args.build_swiftformat) builder.add_product(products.SKStressTester, is_enabled=self.args.build_skstresstester) - builder.add_product(products.SwiftEvolve, - is_enabled=self.args.build_swiftevolve) builder.add_product(products.IndexStoreDB, is_enabled=self.args.build_indexstoredb) builder.add_product(products.PlaygroundSupport, diff --git a/utils/swift_build_support/swift_build_support/products/__init__.py b/utils/swift_build_support/swift_build_support/products/__init__.py index 5a382b8cd68c7..c915e5747abf9 100644 --- a/utils/swift_build_support/swift_build_support/products/__init__.py +++ b/utils/swift_build_support/swift_build_support/products/__init__.py @@ -32,7 +32,6 @@ from .swiftdocc import SwiftDocC from .swiftdoccrender import SwiftDocCRender from .swiftdriver import SwiftDriver -from .swiftevolve import SwiftEvolve from .swiftformat import SwiftFormat from .swiftinspect import SwiftInspect from .swiftpm import SwiftPM @@ -65,7 +64,6 @@ 'XCTest', 'SwiftSyntax', 'SKStressTester', - 'SwiftEvolve', 'IndexStoreDB', 'SourceKitLSP', 'Benchmarks', diff --git a/utils/swift_build_support/swift_build_support/products/swiftevolve.py b/utils/swift_build_support/swift_build_support/products/swiftevolve.py deleted file mode 100644 index efebc85e1b6f9..0000000000000 --- a/utils/swift_build_support/swift_build_support/products/swiftevolve.py +++ /dev/null @@ -1,63 +0,0 @@ -# swift_build_support/products/swiftevolve.py --------------------*- python -*- -# -# This source file is part of the Swift.org open source project -# -# Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors -# Licensed under Apache License v2.0 with Runtime Library Exception -# -# See https://swift.org/LICENSE.txt for license information -# See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors -# -# ---------------------------------------------------------------------------- - -from . import cmark -from . import foundation -from . import libcxx -from . import libdispatch -from . import libicu -from . import llbuild -from . import llvm -from . import skstresstester -from . import swift -from . import swiftpm -from . import swiftsyntax -from . import xctest - - -class SwiftEvolve(skstresstester.SKStressTester): - @classmethod - def product_source_name(cls): - """product_source_name() -> str - - The name of the source code directory of this product. - """ - return "swift-stress-tester" - - def package_name(self): - return 'SwiftEvolve' - - # Inherit the entire build configuration from the SourceKit stress tester - - def should_build(self, host_target): - return True - - def should_test(self, host_target): - return self.args.test_swiftevolve - - def should_install(self, host_target): - return self.args.install_swiftevolve - - @classmethod - def get_dependencies(cls): - return [cmark.CMark, - llvm.LLVM, - libcxx.LibCXX, - libicu.LibICU, - swift.Swift, - libdispatch.LibDispatch, - foundation.Foundation, - xctest.XCTest, - llbuild.LLBuild, - swiftpm.SwiftPM, - swiftsyntax.SwiftSyntax, - skstresstester.SKStressTester]