diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fa33ae..0d02d3e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,8 +78,18 @@ jobs: uses: android-actions/setup-android@v3 with: # Space-separated sdkmanager package ids (semicolons inside package names). - # platforms;android-37 may resolve as android-37.0 on newer cmdline-tools — install both forms when available. - packages: "platform-tools platforms;android-37.0 platforms;android-37 platforms;android-36 platforms;android-35 build-tools;37.0.0 build-tools;36.0.0 build-tools;35.0.0" + # API 37 package id is platforms;android-37.0 (not platforms;android-37). + packages: "platform-tools platforms;android-37.0 platforms;android-36 platforms;android-35 build-tools;37.0.0 build-tools;36.0.0 build-tools;35.0.0" + - name: Symlink android-37 platform dir for AGP + # AGP resolves compileSdk=37 as $ANDROID_HOME/platforms/android-37 + run: | + set -euo pipefail + sdk="${ANDROID_HOME:-${ANDROID_SDK_ROOT:-}}" + test -n "$sdk" + if [[ -d "$sdk/platforms/android-37.0" && ! -e "$sdk/platforms/android-37" ]]; then + ln -s android-37.0 "$sdk/platforms/android-37" + fi + ls -la "$sdk/platforms" - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 - name: Build application diff --git a/docs/PROGRESS.md b/docs/PROGRESS.md index b476675..fb14261 100644 --- a/docs/PROGRESS.md +++ b/docs/PROGRESS.md @@ -24,6 +24,7 @@ Newest entries first. - **Verify (real host, `source scripts/env-mac.sh`):** - `plugins/ ./gradlew build` → **BUILD SUCCESSFUL** (78 tasks) - `application/ ./gradlew build` → **BUILD SUCCESSFUL** (2322 tasks) +- **CI note:** first tip Application job failed installing non-existent `platforms;android-37` — fixed in follow-up (install `android-37.0` + symlink `android-37`) - **Blockers:** none - **Next:** F-088 fleet tooling phase 2