Skip to content

Commit 2cd3b7a

Browse files
committed
ci: stabilize full simulator nightly
1 parent 00632a5 commit 2cd3b7a

6 files changed

Lines changed: 85 additions & 27 deletions

File tree

‎.github/actions/setup-android-replay-host/action.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
name: "Setup Android Replay Host"
22
description: "Prepare the Android CI host for replay tests and expose the agent-device home path"
33

4+
inputs:
5+
package-helpers:
6+
description: "Restore or package the npm-bundled Android snapshot and IME helpers"
7+
required: false
8+
default: "false"
9+
410
outputs:
511
agent-home-dir:
612
description: "Resolved agent-device home directory"
713
value: ${{ steps.agent-home.outputs.dir }}
14+
helpers-cache-hit:
15+
description: "Whether packaged Android helpers were restored from cache"
16+
value: ${{ steps.android-helpers-cache.outputs.cache-hit }}
817

918
runs:
1019
using: "composite"
@@ -20,3 +29,64 @@ runs:
2029
sudo udevadm control --reload-rules
2130
sudo udevadm trigger --name-match=kvm
2231
shell: bash
32+
33+
- name: Resolve Android helper source hash
34+
if: inputs.package-helpers == 'true'
35+
id: android-helper-source
36+
run: |
37+
VERSION="$(node -p 'require("./package.json").version')"
38+
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
39+
echo "value=${{ hashFiles('android/snapshot-helper/AndroidManifest.xml', 'android/snapshot-helper/debug.keystore', 'android/snapshot-helper/src/**', 'android/ime-helper/AndroidManifest.xml', 'android/ime-helper/res/**', 'android/ime-helper/src/**', 'scripts/build-android-snapshot-helper.sh', 'scripts/package-android-snapshot-helper.sh', 'scripts/build-android-ime-helper.sh', 'scripts/package-android-ime-helper.sh', '.github/actions/setup-android-replay-host/action.yml') }}" >> "$GITHUB_OUTPUT"
40+
shell: bash
41+
42+
- name: Restore packaged Android helpers
43+
if: inputs.package-helpers == 'true'
44+
id: android-helpers-cache
45+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.3
46+
with:
47+
path: |
48+
android/snapshot-helper/dist
49+
android/ime-helper/dist
50+
key: android-helpers-${{ runner.os }}-${{ runner.arch }}-api36-v${{ steps.android-helper-source.outputs.version }}-${{ steps.android-helper-source.outputs.value }}
51+
52+
- name: Install Android helper SDK packages
53+
if: inputs.package-helpers == 'true' && steps.android-helpers-cache.outputs.cache-hit != 'true'
54+
run: |
55+
SDK_ROOT="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-/usr/local/lib/android/sdk}}"
56+
SDKMANAGER="$SDK_ROOT/cmdline-tools/latest/bin/sdkmanager"
57+
if [ ! -x "$SDKMANAGER" ]; then
58+
SDKMANAGER="$SDK_ROOT/cmdline-tools/bin/sdkmanager"
59+
fi
60+
if [ ! -x "$SDKMANAGER" ]; then
61+
echo "sdkmanager not found under $SDK_ROOT" >&2
62+
exit 1
63+
fi
64+
yes | "$SDKMANAGER" --licenses >/dev/null || true
65+
"$SDKMANAGER" "platforms;android-36" "build-tools;36.0.0"
66+
shell: bash
67+
68+
- name: Package npm-bundled Android helpers
69+
if: inputs.package-helpers == 'true' && steps.android-helpers-cache.outputs.cache-hit != 'true'
70+
run: |
71+
VERSION="${{ steps.android-helper-source.outputs.version }}"
72+
rm -rf android/snapshot-helper/dist android/ime-helper/dist
73+
sh ./scripts/package-android-snapshot-helper.sh "$VERSION" "v$VERSION" android/snapshot-helper/dist
74+
sh ./scripts/package-android-ime-helper.sh "$VERSION" android/ime-helper/dist
75+
shell: bash
76+
77+
- name: Verify packaged Android helpers
78+
if: inputs.package-helpers == 'true'
79+
run: |
80+
VERSION="$(node -p 'require("./package.json").version')"
81+
test -f "android/snapshot-helper/dist/agent-device-android-snapshot-helper-$VERSION.manifest.json"
82+
test -f "android/ime-helper/dist/agent-device-android-ime-helper-$VERSION.manifest.json"
83+
shell: bash
84+
85+
- name: Save packaged Android helpers
86+
if: inputs.package-helpers == 'true' && steps.android-helpers-cache.outputs.cache-hit != 'true'
87+
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.2.3
88+
with:
89+
path: |
90+
android/snapshot-helper/dist
91+
android/ime-helper/dist
92+
key: android-helpers-${{ runner.os }}-${{ runner.arch }}-api36-v${{ steps.android-helper-source.outputs.version }}-${{ steps.android-helper-source.outputs.value }}

‎.github/workflows/android.yml‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,25 +36,8 @@ jobs:
3636
- name: Setup Android replay host
3737
id: android-replay-host
3838
uses: ./.github/actions/setup-android-replay-host
39-
40-
- name: Install Android SDK packages
41-
run: |
42-
SDK_ROOT="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-/usr/local/lib/android/sdk}}"
43-
SDKMANAGER="$SDK_ROOT/cmdline-tools/latest/bin/sdkmanager"
44-
if [ ! -x "$SDKMANAGER" ]; then
45-
SDKMANAGER="$SDK_ROOT/cmdline-tools/bin/sdkmanager"
46-
fi
47-
if [ ! -x "$SDKMANAGER" ]; then
48-
echo "sdkmanager not found under $SDK_ROOT" >&2
49-
exit 1
50-
fi
51-
yes | "$SDKMANAGER" --licenses >/dev/null
52-
"$SDKMANAGER" "platforms;android-36" "build-tools;36.0.0"
53-
54-
- name: Package npm-bundled Android helpers
55-
run: |
56-
pnpm package:android-snapshot-helper:npm
57-
pnpm package:android-ime-helper:npm
39+
with:
40+
package-helpers: "true"
5841

5942
- name: Run Android smoke checks
6043
uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # v2.35.0

‎.github/workflows/perf-nightly.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,8 @@ jobs:
9797
- name: Setup Android replay host
9898
id: android-replay-host
9999
uses: ./.github/actions/setup-android-replay-host
100-
101-
- name: Package npm-bundled Android helpers
102-
run: |
103-
pnpm package:android-snapshot-helper:npm
104-
pnpm package:android-ime-helper:npm
100+
with:
101+
package-helpers: "true"
105102

106103
- name: Run Android command perf benchmark
107104
uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # v2.35.0

‎.github/workflows/replays-nightly.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
- name: Setup Android replay host
2929
id: android-replay-host
3030
uses: ./.github/actions/setup-android-replay-host
31+
with:
32+
package-helpers: "true"
3133

3234
- name: Run Android replay suite
3335
uses: reactivecircus/android-emulator-runner@b530d96654c385303d652368551fb075bc2f0b6b # v2.35.0

‎.github/workflows/test-app-build-cache.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ jobs:
113113
if: matrix.platform == 'android' && steps.fp.outputs.cached == 'false'
114114
uses: ./.github/actions/setup-android-replay-host
115115

116-
# Deliberately no `set -o pipefail`, matching android.yml: `yes` is killed
117-
# by SIGPIPE once sdkmanager stops reading, and pipefail would report that
118-
# 141 as the step's own failure.
116+
# Deliberately no `set -o pipefail`: `yes` is killed by SIGPIPE once
117+
# sdkmanager stops reading, and pipefail would report that 141 as the
118+
# step's own failure.
119119
- name: Install Android SDK packages
120120
if: matrix.platform == 'android' && steps.fp.outputs.cached == 'false'
121121
run: |

‎test/integration/ios-simulator-e2e/live-full-scenarios.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,18 @@ export async function assertLifecycleAndSystem(context: LiveContext): Promise<vo
6060
'reset',
6161
'microphone',
6262
]);
63+
await runStep(context, 'restart fixture after permission reset', [
64+
'open',
65+
context.appId,
66+
'--relaunch',
67+
]);
6368
await runStep(context, 'restore automation route after permission reset', [
6469
'trigger-app-event',
6570
'fixture.permission.recovery',
6671
'{"source":"permission-reset"}',
6772
]);
6873
await assertWaitText(context, 'Automation lab');
74+
await assertElementText(context, 'id="automation-microphone-permission"', 'not-requested');
6975
await clickMicrophonePermission(context, 'request microphone permission after reset');
7076
await runStep(context, 'wait for recovered microphone permission prompt', [
7177
'alert',

0 commit comments

Comments
 (0)