Skip to content

Commit 2774b34

Browse files
committed
Fix Android preflight sdkmanager prompt handling
1 parent 4adc5a5 commit 2774b34

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

scripts/check_release_readiness.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,6 +2619,7 @@ assertContains("scripts/test_android_consumer_r8_runtime.sh", ":consumer-r8-runt
26192619
assertContains("scripts/test_android_consumer_r8_runtime.sh", "logcat");
26202620
assertContains("scripts/test_android_consumer_r8_runtime.sh", "ensure_avd_exists");
26212621
assertContains("scripts/test_android_consumer_r8_runtime.sh", "$EMULATOR\" -list-avds");
2622+
assertContains("scripts/test_android_consumer_r8_runtime.sh", "{ yes || true; } | \"$SDKMANAGER\"");
26222623
assertContains("scripts/test_android_consumer_r8_runtime.sh", "$AVDMANAGER\" create avd --force");
26232624
assertContains("scripts/test_android_consumer_r8_runtime.sh", "Android consumer R8 runtime gate passed");
26242625
assertContains("packages/kotlin-android/README.md", "me.really:codec-android:0.2.0");

scripts/run_pinned_release_readiness.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const RELEASE_READINESS_COMMIT = "f27973caf9d3a12847cac4032c361f5f553c97e9";
1515
const RELEASE_READINESS_CORE_SHA256 =
1616
"70cc78721738cf352024938e8fc86e73380e71b2cdf7a9a733687543167cbaae";
1717
const LOCAL_CHECKER_SHA256 =
18-
"8b4309a318e042a0c7fae572c259e3f0caea32d56046a4a73093158667353fae";
18+
"180a48848b11ce86655b1910e1db1acc8d3e870c1d059712a22347aa692383fe";
1919
const RELEASE_READINESS_CORE_URL =
2020
`https://raw.githubusercontent.com/reallyme/release-readiness/${RELEASE_READINESS_COMMIT}/core.mjs`;
2121
const VENDORED_CORE_PATH = "scripts/release-readiness/core.mjs";

scripts/test_android_consumer_r8_runtime.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ensure_avd_exists() {
5858

5959
[[ -x "$SDKMANAGER" ]] || fail "Android sdkmanager is required at $SDKMANAGER"
6060
[[ -x "$AVDMANAGER" ]] || fail "Android avdmanager is required at $AVDMANAGER"
61-
yes | "$SDKMANAGER" "emulator" "$ANDROID_R8_PLATFORM" "$ANDROID_R8_SYSTEM_IMAGE" >/dev/null
61+
{ yes || true; } | "$SDKMANAGER" "emulator" "$ANDROID_R8_PLATFORM" "$ANDROID_R8_SYSTEM_IMAGE" >/dev/null
6262
echo "no" | "$AVDMANAGER" create avd --force -n "$AVD_NAME" -k "$ANDROID_R8_SYSTEM_IMAGE" --device "pixel" >/dev/null
6363
}
6464

0 commit comments

Comments
 (0)