Replace an incremental build preset for single-thread with a batch build preset

Author: mtake

utils/build-presets.ini

@@ -188,6 +188,21 @@ skip-test-ios-host
 skip-test-tvos-host
 skip-test-watchos-host
 
+[preset: buildbot,tools=RA,stdlib=RD,single-thread]
+mixin-preset=
+    mixin_buildbot_tools_RA_stdlib_RD
+
+dash-dash
+
+# Enable non-atomic build of the stdlib
+swift-stdlib-use-nonatomic-rc=true
+
+# Don't run host tests for iOS, tvOS and watchOS platforms to make the build
+# faster.
+skip-test-ios-host
+skip-test-tvos-host
+skip-test-watchos-host
+
 [preset: buildbot,tools=R,stdlib=RD]
 mixin-preset=
     mixin_buildbot_tools_R_stdlib_RD
@@ -534,56 +549,6 @@ swift-primary-variant-arch=x86_64
 # Don't build the benchmarks
 skip-build-benchmarks
 
-[preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,single-thread]
-mixin-preset=buildbot_incremental_base
-build-subdir=buildbot_incremental
-
-# We build release+asserts.
-release
-assertions
-
-# We run the OS X tests and validation tests.
-test
-validation-test
-
-llvm-targets-to-build=X86
-
-# Set the vendor to apple
-compiler-vendor=apple
-
-dash-dash
-
-# Always reconfigure cmake
-reconfigure
-
-# We want to always perform a verbose build
-verbose-build
-
-# Build ninja while we are at it
-build-ninja
-
-# We need to build the unittest extras so we can test
-build-swift-stdlib-unittest-extra
-
-# Make sure our stdlib is RA.
-swift-stdlib-build-type=RelWithDebInfo
-swift-stdlib-enable-assertions=true
-swift-stdlib-use-nonatomic-rc=true
-
-# Disable non-x86 building/testing.
-skip-build-ios
-skip-test-ios
-skip-build-tvos
-skip-test-tvos
-skip-build-watchos
-skip-test-watchos
-stdlib-deployment-targets=macosx-x86_64
-swift-primary-variant-sdk=OSX
-swift-primary-variant-arch=x86_64
-
-# Don't build the benchmarks
-skip-build-benchmarks
-
 [preset: buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx,flto]
 mixin-preset=buildbot_incremental,tools=RA,stdlib=RD,smoketest=macosx
 build-subdir=buildbot_incremental