From 319f18d33abd8e8bf186a5d8db2ad745ab563c11 Mon Sep 17 00:00:00 2001 From: Krzysztof kuhy Rudnicki Date: Wed, 11 Nov 2026 15:53:55 +0100 Subject: [PATCH] deploy.sh: one phone lease owner per run Co-Authored-By: Claude Opus 5.5 --- pubspec.yaml | 2 +- scripts/deploy.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index 85e8a76..9cec33d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.0.80+1 +version: 1.0.81+1 environment: sdk: ^3.12.2 diff --git a/scripts/deploy.sh b/scripts/deploy.sh index d3ff345..f098cbd 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -146,7 +146,11 @@ deploy_phone() { # build signs with the debug key and cannot install over a CI build. [[ -f "$KEY_PROPS" || ! -f "$SHARED_KEY_PROPS" ]] || install -m 600 "$SHARED_KEY_PROPS" "$KEY_PROPS" - ADB_SERIAL="$SERIAL" heavy "$PHONE_DEPLOY" "$ROOT" --release || rc=$? + # Outside a Claude session each phone_lease call would name its own + # pid as owner, so phone_deploy's launch step blocked on the lease its + # own install step took (exit 35). One owner for the whole run. + PHONE_LEASE_OWNER="${PHONE_LEASE_OWNER:-deploy:$$}" ADB_SERIAL="$SERIAL" \ + heavy "$PHONE_DEPLOY" "$ROOT" --release || rc=$? ((rc == 0)) || { fail phone "phone_deploy.sh exited $rc (see its exit-code table)"; return; } fi phone_health "$want"