add missing android-35 dependency (#2101)

This commit is contained in:
cyan 2025-03-21 04:03:17 +01:00 committed by GitHub
parent 5a09eecb01
commit 00642e6027
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 8 deletions

View file

@ -9,7 +9,7 @@ jobs:
PR_test_build: PR_test_build:
runs-on: linux-amd64 runs-on: linux-amd64
container: container:
image: ghcr.io/cake-tech/cake_wallet:main-linux image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
env: env:
STORE_PASS: test@cake_wallet STORE_PASS: test@cake_wallet
KEY_PASS: test@cake_wallet KEY_PASS: test@cake_wallet
@ -307,4 +307,4 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
path: ${{ github.workspace }}/build/app/outputs/flutter-apk path: ${{ github.workspace }}/build/app/outputs/flutter-apk
name: "android apk" name: "android apk"

View file

@ -9,7 +9,7 @@ jobs:
PR_test_build: PR_test_build:
runs-on: linux-amd64 runs-on: linux-amd64
container: container:
image: ghcr.io/cake-tech/cake_wallet:main-linux image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
env: env:
STORE_PASS: test@cake_wallet STORE_PASS: test@cake_wallet
KEY_PASS: test@cake_wallet KEY_PASS: test@cake_wallet

View file

@ -1,6 +1,6 @@
# Usage: # Usage:
# docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:main-linux # docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:3.24.4-linux
# docker push ghcr.io/cake-tech/cake_wallet:main-linux # docker push ghcr.io/cake-tech/cake_wallet:3.24.4-linux
# Heavily inspired by cirrusci images # Heavily inspired by cirrusci images
# https://github.com/cirruslabs/docker-images-android/blob/master/sdk/tools/Dockerfile # https://github.com/cirruslabs/docker-images-android/blob/master/sdk/tools/Dockerfile
@ -23,7 +23,7 @@ ENV FLUTTER_VERSION=3.24.4
# Comes from https://developer.android.com/studio/#command-tools # Comes from https://developer.android.com/studio/#command-tools
ENV ANDROID_SDK_TOOLS_VERSION=11076708 ENV ANDROID_SDK_TOOLS_VERSION=11076708
# Comes from https://developer.android.com/studio/releases/build-tools # Comes from https://developer.android.com/studio/releases/build-tools
ENV ANDROID_PLATFORM_VERSION=34 ENV ANDROID_PLATFORM_VERSION=35
ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0 ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0
# If we ever need to migrate the home directory... # If we ever need to migrate the home directory...
@ -106,6 +106,8 @@ RUN yes | sdkmanager \
"platforms;android-$ANDROID_PLATFORM_VERSION" \ "platforms;android-$ANDROID_PLATFORM_VERSION" \
"build-tools;$ANDROID_BUILD_TOOLS_VERSION" \ "build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
"platforms;android-33" \ "platforms;android-33" \
"platforms;android-34" \
"platforms;android-35" \
"build-tools;33.0.2" \ "build-tools;33.0.2" \
"build-tools;33.0.1" \ "build-tools;33.0.1" \
"build-tools;33.0.0" \ "build-tools;33.0.0" \
@ -118,10 +120,11 @@ RUN yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
# Install dependencies for tests # Install dependencies for tests
# Comes from https://github.com/ReactiveCircus/android-emulator-runner # Comes from https://github.com/ReactiveCircus/android-emulator-runner
RUN yes | sdkmanager "system-images;android-29;default;x86" \ RUN yes | sdkmanager \
"system-images;android-29;default;x86_64" \ "system-images;android-29;default;x86_64" \
"system-images;android-31;default;x86_64" \ "system-images;android-31;default;x86_64" \
"platforms;android-29" "platforms;android-29" \
"platforms;android-31"
# Fake the KVM status so the Android emulator doesn't complain (that much) # Fake the KVM status so the Android emulator doesn't complain (that much)
RUN (addgroup kvm || true) && \ RUN (addgroup kvm || true) && \