Skip to content

Commit

Permalink
Merge pull request #69388 from ahoppen/ahoppen/remove-swiftevolve
Browse files Browse the repository at this point in the history
[build] Remove swiftevolve
  • Loading branch information
ahoppen authored Oct 25, 2023
2 parents 1611ca0 + 6a8ad4b commit 12b5008
Show file tree
Hide file tree
Showing 8 changed files with 1 addition and 92 deletions.
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 1 addition & 9 deletions utils/build-presets.ini
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ swiftsyntax
swiftformat

skstresstester
swiftevolve

# Build Playground support
playgroundsupport
Expand Down Expand Up @@ -544,7 +543,6 @@ skip-test-llbuild
skip-test-playgroundsupport
skip-test-swiftsyntax
skip-test-skstresstester
skip-test-swiftevolve
indexstore-db=0
sourcekit-lsp=0

Expand Down Expand Up @@ -1425,7 +1423,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]
Expand Down Expand Up @@ -1465,7 +1462,6 @@ skip-test-playgroundsupport
skip-test-swiftsyntax
skip-test-swiftformat
skip-test-skstresstester
skip-test-swiftevolve
skip-test-swiftdocc

# macOS package with out test
Expand Down Expand Up @@ -1630,9 +1626,8 @@ install-swiftsyntax
install-libcxx
install-swiftdocc

# Build the stress tester and SwiftEvolve
# Build the stress tester
skstresstester
swiftevolve

# Build Playground support
playgroundsupport
Expand Down Expand Up @@ -1859,7 +1854,6 @@ swiftsyntax-verify-generated-files
swiftsyntax-lint
swiftformat
skstresstester
swiftevolve
sourcekit-lsp
skip-test-swift=false

Expand Down Expand Up @@ -1902,9 +1896,7 @@ mixin-preset=mixin_swiftpm_package_macos_platform
release
assertions
skstresstester
swiftevolve
install-skstresstester
install-swiftevolve

#===------------------------------------------------------------------------===#
# Test SourceKit-LSP
Expand Down
8 changes: 0 additions & 8 deletions utils/build_swift/build_swift/driver_arguments.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'),
Expand Down Expand Up @@ -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'],
Expand Down Expand Up @@ -1244,8 +1238,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')
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions utils/build_swift/tests/expected_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -291,7 +289,6 @@
'test_sourcekitlsp': False,
'test_skstresstester': False,
'test_swiftformat': False,
'test_swiftevolve': False,
'test_swiftdocc': False,
'test_toolchainbenchmarks': False,
'test_wasmstdlib': True,
Expand Down Expand Up @@ -543,7 +540,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('--build-wasm-stdlib', dest='build_wasmstdlib'),
Expand Down Expand Up @@ -624,7 +620,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'),
Expand Down Expand Up @@ -707,7 +702,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'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -67,7 +66,6 @@
'XCTest',
'SwiftSyntax',
'SKStressTester',
'SwiftEvolve',
'IndexStoreDB',
'SourceKitLSP',
'Benchmarks',
Expand Down

This file was deleted.

0 comments on commit 12b5008

Please sign in to comment.