Skip to content

Commit b99a0c2

Browse files
committed
Simplify macOS SDK setup
1 parent 60f9df2 commit b99a0c2

File tree

1 file changed

+7
-20
lines changed

1 file changed

+7
-20
lines changed

.github/workflows/scripts-android.yml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,15 @@ jobs:
5252
- name: Install Android SDK
5353
uses: android-actions/setup-android@v3
5454
with:
55-
accept-android-sdk-licenses: false
56-
packages: ''
55+
accept-android-sdk-licenses: true
56+
packages: |
57+
platform-tools
58+
build-tools;34.0.0
59+
platforms;android-33
5760
58-
- name: Install Android platform tools
59-
shell: bash
61+
- name: Verify platform tools
6062
run: |
61-
set -eux
62-
if ! command -v sdkmanager >/dev/null 2>&1; then
63-
echo "sdkmanager executable is required" >&2
64-
exit 1
65-
fi
66-
67-
yes 2>/dev/null | sdkmanager --licenses >/dev/null
68-
yes 2>/dev/null | sdkmanager --install "platform-tools" "build-tools;34.0.0" "platforms;android-33" >/dev/null
69-
70-
if [ -n "${ANDROID_HOME:-}" ] && [ -d "${ANDROID_HOME}/platform-tools" ]; then
71-
echo "${ANDROID_HOME}/platform-tools" >> "$GITHUB_PATH"
72-
fi
73-
if [ -n "${ANDROID_SDK_ROOT:-}" ] && [ -d "${ANDROID_SDK_ROOT}/platform-tools" ]; then
74-
echo "${ANDROID_SDK_ROOT}/platform-tools" >> "$GITHUB_PATH"
75-
fi
76-
63+
set -euxo pipefail
7764
command -v adb
7865
adb version
7966

0 commit comments

Comments
 (0)