diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 891306f..da1de78 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -31,8 +31,10 @@ jobs: run: | set -euo pipefail if [ ! -d "$ANDROID_HOME/platforms/android-36" ]; then - yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \ - "platforms;android-36" "build-tools;36.0.0" >/dev/null + # stdin is already covered by the image's accepted licenses; do not + # 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 fi - name: Test and build diff --git a/ci/Dockerfile b/ci/Dockerfile index 02d49d4..8998f21 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -39,8 +39,8 @@ RUN mkdir -p "$ANDROID_HOME/cmdline-tools" \ && yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses > /dev/null \ && "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" \ "platform-tools" \ - "platforms;android-35" \ - "build-tools;35.0.0" \ + "platforms;android-36" \ + "build-tools;36.0.0" \ && rm -rf "$ANDROID_HOME/.temp" "$ANDROID_HOME/.downloadIntermediates" # Warm the Gradle dependency cache and the Kotlin/Wasm (node, yarn, binaryen)