Also add platform 36 to the CI image for the next rebuild.
This commit is contained in:
1 parent
9b105b3925
commit
67414b5986
2 files changed
+6
-4
No files matched your search
@@ -31,8 +31,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
if [ ! -d "$ANDROID_HOME/platforms/android-36" ]; then
|
if [ ! -d "$ANDROID_HOME/platforms/android-36" ]; then
|
||||||
yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
|
# stdin is already covered by the image's accepted licenses; do not
|
||||||
"platforms;android-36" "build-tools;36.0.0" >/dev/null
|
# pipe `yes` here, it dies with SIGPIPE and fails under pipefail.
|
||||||
|
"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install \
|
||||||
|
"platforms;android-36" "build-tools;36.0.0" </dev/null >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Test and build
|
- name: Test and build
|
||||||
|
|||||||
+2
-2
@@ -39,8 +39,8 @@ RUN mkdir -p "$ANDROID_HOME/cmdline-tools" \
|
|||||||
&& yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null \
|
&& yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null \
|
||||||
&& "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
|
&& "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \
|
||||||
"platform-tools" \
|
"platform-tools" \
|
||||||
"platforms;android-35" \
|
"platforms;android-36" \
|
||||||
"build-tools;35.0.0" \
|
"build-tools;36.0.0" \
|
||||||
&& rm -rf "$ANDROID_HOME/.temp" "$ANDROID_HOME/.downloadIntermediates"
|
&& rm -rf "$ANDROID_HOME/.temp" "$ANDROID_HOME/.downloadIntermediates"
|
||||||
|
|
||||||
# Warm the Gradle dependency cache and the Kotlin/Wasm (node, yarn, binaryen)
|
# Warm the Gradle dependency cache and the Kotlin/Wasm (node, yarn, binaryen)
|
||||||
|
|||||||
Reference in new issue
Block a user