Skip to content

Commit 7256a92

Browse files
committed
[build-script] Remove option to lint swift-syntax
This is being verified by GitHub Actions now as of swiftlang/swift-syntax#2998.
1 parent 33eab01 commit 7256a92

File tree

4 files changed

+0
-39
lines changed

4 files changed

+0
-39
lines changed

utils/build-presets.ini

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,7 +2001,6 @@ swiftsyntax
20012001
swiftsyntax-enable-rawsyntax-validation
20022002
swiftsyntax-enable-test-fuzzing
20032003
swiftsyntax-verify-generated-files
2004-
swiftsyntax-lint
20052004
swiftformat
20062005
skstresstester
20072006
sourcekit-lsp
@@ -2030,7 +2029,6 @@ assertions
20302029
swiftsyntax
20312030
swiftformat
20322031
install-swiftformat
2033-
swiftsyntax-lint
20342032
sourcekit-lsp-lint
20352033

20362034
[preset: buildbot_swiftformat_linux]
@@ -2039,7 +2037,6 @@ release
20392037
assertions
20402038
swiftsyntax
20412039
swiftformat
2042-
swiftsyntax-lint
20432040

20442041
#===------------------------------------------------------------------------===#
20452042
# Test Swift Stress Tester

utils/build_swift/build_swift/driver_arguments.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -788,9 +788,6 @@ def create_argument_parser():
788788
help='set to validate that RawSyntax layout nodes contain children of ' +
789789
'the expected types and that RawSyntax tokens have the expected ' +
790790
'token kinds')
791-
option('--swiftsyntax-lint',
792-
toggle_true('swiftsyntax_lint'),
793-
help='verify that swift-syntax Source code is formatted correctly')
794791
option(['--install-sourcekit-lsp'], toggle_true('install_sourcekitlsp'),
795792
help='install SourceKitLSP')
796793
option(['--install-swiftformat'], toggle_true('install_swiftformat'),

utils/build_swift/tests/expected_options.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@
122122
'swiftsyntax_verify_generated_files': False,
123123
'swiftsyntax_enable_rawsyntax_validation': False,
124124
'swiftsyntax_enable_test_fuzzing': False,
125-
'swiftsyntax_lint': False,
126125
'install_playgroundsupport': False,
127126
'install_sourcekitlsp': False,
128127
'install_swiftformat': False,
@@ -667,8 +666,6 @@ class BuildScriptImplOption(_BaseOption):
667666
dest='swiftsyntax_enable_rawsyntax_validation'),
668667
EnableOption('--swiftsyntax-enable-test-fuzzing',
669668
dest='swiftsyntax_enable_test_fuzzing'),
670-
EnableOption('--swiftsyntax-lint',
671-
dest='swiftsyntax_lint'),
672669
EnableOption('--install-swiftpm', dest='install_swiftpm'),
673670
EnableOption('--install-swift-driver', dest='install_swift_driver'),
674671
EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),

utils/swift_build_support/swift_build_support/products/swiftformat.py

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -103,39 +103,9 @@ def should_build(self, host_target):
103103

104104
def build(self, host_target):
105105
self.run_build_script_helper('build', host_target)
106-
if self.args.swiftsyntax_lint:
107-
self.lint_swiftsyntax(host_target)
108106
if self.args.sourcekitlsp_lint:
109107
self.lint_sourcekitlsp()
110108

111-
def lint_swiftsyntax(self, host_target):
112-
swift_exec = os.path.join(
113-
self.install_toolchain_path(host_target),
114-
'bin',
115-
'swift'
116-
)
117-
swift_syntax_dev_utils_dir = os.path.join(
118-
os.path.dirname(self.source_dir),
119-
'swift-syntax',
120-
'SwiftSyntaxDevUtils'
121-
)
122-
swift_format_exec = os.path.join(
123-
self.build_dir,
124-
self.configuration(),
125-
'swift-format'
126-
)
127-
linting_cmd = [
128-
swift_exec,
129-
'run',
130-
'--package-path', swift_syntax_dev_utils_dir,
131-
'swift-syntax-dev-utils',
132-
'format',
133-
'--verbose',
134-
'--lint',
135-
'--swift-format', swift_format_exec
136-
]
137-
shell.call(linting_cmd, env={'SWIFTCI_USE_LOCAL_DEPS': '1'})
138-
139109
def lint_sourcekitlsp(self):
140110
linting_cmd = [
141111
os.path.join(self.build_dir, self.configuration(), 'swift-format'),

0 commit comments

Comments
 (0)