Skip to content

Commit 2c069c4

Browse files
committed
build-presets: Update/simplify incremental Xcode preset
This is our /only/ standard Xcode preset, and it's been disabled for a long time. Since only a limited configuration is supported for building with Xcode (pretty much just LLVM and Swift, with only a macOS standard library), it doesn't make sense to base it on the regular incremental preset. Pare it down to what's most important to keep working in hopes of turning the bot back on.
1 parent bbfda2e commit 2c069c4

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

utils/build-presets.ini

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,18 @@ install-llbuild
346346
install-swiftpm
347347
install-libcxx
348348

349+
349350
[preset: buildbot_incremental,tools=RA,stdlib=RA,xcode]
350-
mixin-preset=buildbot_incremental,tools=RA,stdlib=RA
351-
build-subdir=buildbot_incremental_xcode
351+
mixin-preset=buildbot_incremental_base
352352

353+
build-subdir=buildbot_incremental_xcode
353354
xcode
354-
dash-dash
355+
libcxx
356+
357+
# Build Release without debug info, because it is faster to build.
358+
release
359+
assertions
360+
355361
# We do not support building cross compiled stdlibs on OS X with Xcode. So only
356362
# build the OS X SDK.
357363
skip-build-ios
@@ -363,12 +369,12 @@ skip-test-watchos
363369
stdlib-deployment-targets=macosx-x86_64
364370
swift-primary-variant-sdk=OSX
365371
swift-primary-variant-arch=x86_64
366-
skip-build-llbuild
367-
skip-test-llbuild
368-
skip-build-swiftpm
369-
skip-test-swiftpm
370-
skip-build-playgroundsupport
371-
skip-test-playgroundsupport
372+
373+
# CMark's tests aren't set up to handle the config-specific build directories
374+
# that CMake uses for Xcode. Rather than change CMark (which is 99% the same
375+
# as upstream), we'll just skip testing it.
376+
skip-test-cmark
377+
372378

373379
# This preset is used by CI to test swift-corelibs-xctest.
374380
[preset: buildbot_incremental,tools=RA,stdlib=RA,XCTest]

0 commit comments

Comments
 (0)