Skip to content

Harden simulator boot handling and update sharp #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RNT56 merged 2 commits into from
Jul 22, 2026
Merged

Harden simulator boot handling and update sharp #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbf0be5
Harden simulator boot readiness timeout
Jul 21, 2026
23fb467
Bump sharp from 0.34.5 to 0.35.3 in /site
dependabot[bot] Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ jobs:
timeout-minutes: 120
env:
PINES_SIMULATOR_OPERATION_TIMEOUT_SECONDS: 180
PINES_SIMULATOR_BOOT_TIMEOUT_SECONDS: 600
PINES_XCODE_TEST_TIMEOUT_SECONDS: 720
PINES_XCODE_TEST_ATTEMPTS: 1
PINES_XCODE_UI_SHARD_ATTEMPTS: 2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
timeout-minutes: 150
env:
PINES_SIMULATOR_OPERATION_TIMEOUT_SECONDS: 180
PINES_SIMULATOR_BOOT_TIMEOUT_SECONDS: 600
PINES_XCODE_TEST_TIMEOUT_SECONDS: 720
PINES_XCODE_TEST_ATTEMPTS: 1
PINES_XCODE_UI_SHARD_ATTEMPTS: 2
Expand Down
8 changes: 8 additions & 0 deletions scripts/ci/check-xcode-workflow-contracts.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

required_environment = {
"PINES_SIMULATOR_OPERATION_TIMEOUT_SECONDS" => "180",
"PINES_SIMULATOR_BOOT_TIMEOUT_SECONDS" => "600",
"PINES_XCODE_TEST_TIMEOUT_SECONDS" => "720",
"PINES_XCODE_TEST_ATTEMPTS" => "1",
"PINES_XCODE_UI_SHARD_ATTEMPTS" => "2",
Expand Down Expand Up @@ -33,6 +34,13 @@
end

validation_script = File.read("scripts/ci/run-xcode-validation.sh")
bootstatus_timeout_calls = validation_script.scan(
/run_with_timeout "\$boot_timeout_seconds" xcrun simctl bootstatus/,
).length
unless bootstatus_timeout_calls == 2
abort "scripts/ci/run-xcode-validation.sh: both bootstatus calls must use the dedicated boot timeout"
end

artifact_smoke_shards = %w[
testArtifactsLibraryAndDetail
testArtifactsImageStudioConfiguration
Expand Down
26 changes: 14 additions & 12 deletions scripts/ci/run-xcode-validation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,12 +357,13 @@ prepare_test_simulator() {
fi

echo "Preparing simulator $simulator_id for runtime tests..."
local timeout_seconds="${PINES_SIMULATOR_OPERATION_TIMEOUT_SECONDS:-180}"
run_with_timeout "$timeout_seconds" xcrun simctl shutdown "$simulator_id" >/dev/null 2>&1 || true
run_with_timeout "$timeout_seconds" xcrun simctl erase "$simulator_id"
run_with_timeout "$timeout_seconds" xcrun simctl boot "$simulator_id"
if ! run_with_timeout "$timeout_seconds" xcrun simctl bootstatus "$simulator_id" -b; then
echo "::error::Simulator $simulator_id did not finish booting within ${timeout_seconds}s." >&2
local operation_timeout_seconds="${PINES_SIMULATOR_OPERATION_TIMEOUT_SECONDS:-180}"
local boot_timeout_seconds="${PINES_SIMULATOR_BOOT_TIMEOUT_SECONDS:-600}"
run_with_timeout "$operation_timeout_seconds" xcrun simctl shutdown "$simulator_id" >/dev/null 2>&1 || true
run_with_timeout "$operation_timeout_seconds" xcrun simctl erase "$simulator_id"
run_with_timeout "$operation_timeout_seconds" xcrun simctl boot "$simulator_id"
if ! run_with_timeout "$boot_timeout_seconds" xcrun simctl bootstatus "$simulator_id" -b; then
echo "::error::Simulator $simulator_id did not finish booting within ${boot_timeout_seconds}s." >&2
xcrun simctl diagnose -b --no-archive || true
return 1
fi
Expand Down Expand Up @@ -420,25 +421,26 @@ run_ui_test_clone_attempt() {
local test="$2"
local index="$3"
local attempt="$4"
local timeout_seconds="${PINES_SIMULATOR_OPERATION_TIMEOUT_SECONDS:-180}"
local operation_timeout_seconds="${PINES_SIMULATOR_OPERATION_TIMEOUT_SECONDS:-180}"
local boot_timeout_seconds="${PINES_SIMULATOR_BOOT_TIMEOUT_SECONDS:-600}"
local clone_name
clone_name="Pines-CI-UI-$$-$index-$attempt-$(date +%s)"

echo "Cloning migrated simulator $base_simulator_id for ${test##*/} (attempt $attempt)..."
ui_test_simulator_id=""
if ! ui_test_simulator_id="$(run_with_timeout "$timeout_seconds" \
if ! ui_test_simulator_id="$(run_with_timeout "$operation_timeout_seconds" \
xcrun simctl clone "$base_simulator_id" "$clone_name")"; then
echo "::warning::Unable to clone simulator $base_simulator_id for ${test##*/} attempt $attempt." >&2
return 1
fi

if ! run_with_timeout "$timeout_seconds" xcrun simctl boot "$ui_test_simulator_id"; then
echo "::warning::UI-test clone $ui_test_simulator_id did not boot within ${timeout_seconds}s." >&2
if ! run_with_timeout "$operation_timeout_seconds" xcrun simctl boot "$ui_test_simulator_id"; then
echo "::warning::UI-test clone $ui_test_simulator_id did not boot within ${operation_timeout_seconds}s." >&2
cleanup_ui_test_simulator
return 1
fi
if ! run_with_timeout "$timeout_seconds" xcrun simctl bootstatus "$ui_test_simulator_id" -b; then
echo "::warning::UI-test clone $ui_test_simulator_id did not finish booting within ${timeout_seconds}s." >&2
if ! run_with_timeout "$boot_timeout_seconds" xcrun simctl bootstatus "$ui_test_simulator_id" -b; then
echo "::warning::UI-test clone $ui_test_simulator_id did not finish booting within ${boot_timeout_seconds}s." >&2
xcrun simctl diagnose -b --no-archive || true
cleanup_ui_test_simulator
return 1
Expand Down
Loading