Skip to content

Commit eb1ea4e

Browse files
authored
Merge pull request swiftlang#78950 from compnerd/mimalloc
update_checkout: add mimalloc
2 parents 995bc0e + 35da98d commit eb1ea4e

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

utils/build-windows-toolchain.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ set "args=%args% --skip-repository swift"
105105
set "args=%args% --skip-repository ninja"
106106
set "args=%args% --skip-repository swift-integration-tests"
107107
set "args=%args% --skip-repository swift-stress-tester"
108-
set "args=%args% --skip-repository swift-xcode-playground-support"
109108

110109
call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-history --reset-to-remote --github-comment "%ghprbCommentBody%"
111110

utils/update_checkout/update-checkout-config.json

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
"swift-integration-tests": {
5656
"remote": { "id": "swiftlang/swift-integration-tests" } },
5757
"swift-xcode-playground-support": {
58-
"remote": { "id": "apple/swift-xcode-playground-support" } },
58+
"remote": { "id": "apple/swift-xcode-playground-support" },
59+
"platforms": [ "Darwin" ]
60+
},
5961
"ninja": {
6062
"remote": { "id": "ninja-build/ninja" } },
6163
"yams": {
@@ -113,6 +115,10 @@
113115
},
114116
"zlib": {
115117
"remote": { "id": "madler/zlib" }
118+
},
119+
"mimalloc": {
120+
"remote": { "id": "microsoft/mimalloc" },
121+
"platforms": [ "Windows" ]
116122
}
117123
},
118124
"default-branch-scheme": "main",
@@ -167,7 +173,8 @@
167173
"wasmkit": "0.1.2",
168174
"curl": "curl-8_9_1",
169175
"libxml2": "v2.11.5",
170-
"zlib": "v1.3.1"
176+
"zlib": "v1.3.1",
177+
"mimalloc": "v3.0.1"
171178
}
172179
},
173180
"release/6.1": {
@@ -374,7 +381,8 @@
374381
"wasmkit": "0.1.2",
375382
"curl": "curl-8_9_1",
376383
"libxml2": "v2.11.5",
377-
"zlib": "v1.3.1"
384+
"zlib": "v1.3.1",
385+
"mimalloc": "v3.0.1"
378386
}
379387
},
380388
"next" : {
@@ -421,9 +429,9 @@
421429
"wasi-libc": "wasi-sdk-24",
422430
"wasmkit": "0.1.2",
423431
"curl": "curl-8_9_1",
424-
"icu": "maint/maint-69",
425432
"libxml2": "v2.11.5",
426-
"zlib": "v1.3.1"
433+
"zlib": "v1.3.1",
434+
"mimalloc": "v3.0.1"
427435
}
428436
}
429437
}

0 commit comments

Comments
 (0)