You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
[system-dependencies] Make simulator runtime installation a bit more resilient. (#24243)
* If there are any unusable simulator runtimes, delete them all. A frequent failure
is when a simulator runtime isn't ready because "Unusable - Other Failure: Duplicate
of ...", so hopefully this will solve those problems.
* Don't pass -buildVersion to 'xcodebuild -downloadPlatform', Apple's tooling doesn't
seem able to handle it correctly and gets confused.
* Remove a stray 'sleep 60'.
# sadly simulator deletion is done asynchronously, so we have to wait until they're all gone
328
+
log "Waiting for the simulator runtimes to be deleted..."
329
+
printf""
330
+
foriin$(seq 1 60);do
331
+
sleep 1
332
+
xcrun simctl runtime list -j --json-output="$TMPFILE"
333
+
COUNT=$(jq "length" -r "$TMPFILE")
334
+
if [[ "$COUNT"=="0" ]];then
335
+
break
336
+
fi
337
+
printf"$COUNT"
338
+
done
339
+
printf"\n"
340
+
if [[ "$COUNT"!="0" ]];then
341
+
warn "Waited for 60 seconds, but there are still $COUNT simulators waiting to deleted."
342
+
fi
343
+
344
+
rm -rf "$TMPFILE"
345
+
}
346
+
317
347
SIMULATORS_WITHOUT_X64=()
318
348
SIMULATORS_WITHOUT_X64_COUNT=0
319
349
functionget_non_universal_simulator_runtimes ()
@@ -350,21 +380,30 @@ function xcodebuild_download_selected_platforms ()
350
380
351
381
IOS_BUILD_VERSION=
352
382
TVOS_BUILD_VERSION=
353
-
if is_at_least_version "$XCODE_VERSION" 26.1;then
354
-
# passing -buildVersion .. --architectureVariant .. doesn't quite work in Xcode 26.0 (it works the first time, but then it always thinks it's the first time, tries to download and install, and gets confused), let's see if they fix it in Xcode 26.1
355
-
if [[ "$XCODE_IS_STABLE"=="YES" ]];then
356
-
# we always want the universal variant, so that we can run x64 test apps on arm64
357
-
IOS_NUGET_OS_VERSION=$(grep '^IOS_NUGET_OS_VERSION=' Make.versions | sed 's/.*=//')
0 commit comments