Skip to content

Commit c51a6c0

Browse files
committed
Disable sourcekit-lsp and indexstore-db on Ubuntu 14.04
We need to decide if we want to support these configurations, and in the meantime it's better for us to disable them while we stabilize on the other platforms. Fixes the currently broken build on 14.04.
1 parent 8dcfac6 commit c51a6c0

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

utils/build-presets.ini

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,8 @@ mixin-preset=
880880
# Ubuntu 14.04 preset for backwards compat and future customizations.
881881
[preset: buildbot_linux_1404]
882882
mixin-preset=buildbot_linux
883+
indexstore-db=0
884+
sourcekit-lsp=0
883885

884886
# Ubuntu 14.04 preset that skips all tests except for integration testing of the
885887
# package.
@@ -919,6 +921,8 @@ long-test
919921
stress-test
920922
foundation
921923
lit-args=-v
924+
indexstore-db=0
925+
sourcekit-lsp=0
922926

923927
[preset: buildbot_linux_armv7]
924928
release
@@ -1050,6 +1054,14 @@ dash-dash
10501054
build-ninja
10511055
reconfigure
10521056

1057+
[preset: buildbot_incremental_linux_1404]
1058+
mixin-preset=buildbot_incremental_linux
1059+
indexstore-db=0
1060+
sourcekit-lsp=0
1061+
1062+
[preset: buildbot_incremental_linux_1404,long_test]
1063+
mixin-preset=buildbot_incremental_linux_1404
1064+
10531065
#===------------------------------------------------------------------------===#
10541066
# OS X Package Builders
10551067
#===------------------------------------------------------------------------===#

utils/build_swift/driver_arguments.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,9 +532,9 @@ def create_argument_parser():
532532
option(['--swiftevolve'], store_true('build_swiftevolve'),
533533
help='build the swift-evolve tool')
534534

535-
option(['--indexstore-db'], store_true('build_indexstoredb'),
535+
option(['--indexstore-db'], toggle_true('build_indexstoredb'),
536536
help='build IndexStoreDB')
537-
option(['--sourcekit-lsp'], store_true('build_sourcekitlsp'),
537+
option(['--sourcekit-lsp'], toggle_true('build_sourcekitlsp'),
538538
help='build SourceKitLSP')
539539

540540
option('--xctest', toggle_true('build_xctest'),

utils/build_swift/tests/expected_options.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,6 @@ class IgnoreOption(_BaseOption):
411411
SetTrueOption('--build-libparser-only', dest='build_libparser_only'),
412412
SetTrueOption('--skstresstester', dest='build_skstresstester'),
413413
SetTrueOption('--swiftevolve', dest='build_swiftevolve'),
414-
SetTrueOption('--indexstore-db', dest='build_indexstoredb'),
415-
SetTrueOption('--sourcekit-lsp', dest='build_sourcekitlsp'),
416414
SetTrueOption('-B', dest='benchmark'),
417415
SetTrueOption('-S', dest='skip_build'),
418416
SetTrueOption('-b', dest='build_llbuild'),
@@ -445,6 +443,8 @@ class IgnoreOption(_BaseOption):
445443
EnableOption('--host-test'),
446444
EnableOption('--libdispatch', dest='build_libdispatch'),
447445
EnableOption('--libicu', dest='build_libicu'),
446+
EnableOption('--indexstore-db', dest='build_indexstoredb'),
447+
EnableOption('--sourcekit-lsp', dest='build_sourcekitlsp'),
448448
EnableOption('--long-test'),
449449
EnableOption('--show-sdks'),
450450
EnableOption('--stress-test'),

0 commit comments

Comments
 (0)