mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-04-17 16:41:55 +00:00
add missing android-35 dependency (#2101)
This commit is contained in:
parent
5a09eecb01
commit
00642e6027
3 changed files with 11 additions and 8 deletions
4
.github/workflows/pr_test_build_android.yml
vendored
4
.github/workflows/pr_test_build_android.yml
vendored
|
@ -9,7 +9,7 @@ jobs:
|
|||
PR_test_build:
|
||||
runs-on: linux-amd64
|
||||
container:
|
||||
image: ghcr.io/cake-tech/cake_wallet:main-linux
|
||||
image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
|
||||
env:
|
||||
STORE_PASS: test@cake_wallet
|
||||
KEY_PASS: test@cake_wallet
|
||||
|
@ -307,4 +307,4 @@ jobs:
|
|||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
path: ${{ github.workspace }}/build/app/outputs/flutter-apk
|
||||
name: "android apk"
|
||||
name: "android apk"
|
||||
|
|
2
.github/workflows/pr_test_build_linux.yml
vendored
2
.github/workflows/pr_test_build_linux.yml
vendored
|
@ -9,7 +9,7 @@ jobs:
|
|||
PR_test_build:
|
||||
runs-on: linux-amd64
|
||||
container:
|
||||
image: ghcr.io/cake-tech/cake_wallet:main-linux
|
||||
image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
|
||||
env:
|
||||
STORE_PASS: test@cake_wallet
|
||||
KEY_PASS: test@cake_wallet
|
||||
|
|
13
Dockerfile
13
Dockerfile
|
@ -1,6 +1,6 @@
|
|||
# Usage:
|
||||
# docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:main-linux
|
||||
# docker push 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:3.24.4-linux
|
||||
|
||||
# Heavily inspired by cirrusci images
|
||||
# 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
|
||||
ENV ANDROID_SDK_TOOLS_VERSION=11076708
|
||||
# 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
|
||||
|
||||
# If we ever need to migrate the home directory...
|
||||
|
@ -106,6 +106,8 @@ RUN yes | sdkmanager \
|
|||
"platforms;android-$ANDROID_PLATFORM_VERSION" \
|
||||
"build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
|
||||
"platforms;android-33" \
|
||||
"platforms;android-34" \
|
||||
"platforms;android-35" \
|
||||
"build-tools;33.0.2" \
|
||||
"build-tools;33.0.1" \
|
||||
"build-tools;33.0.0" \
|
||||
|
@ -118,10 +120,11 @@ RUN yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
|
|||
|
||||
# Install dependencies for tests
|
||||
# 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-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)
|
||||
RUN (addgroup kvm || true) && \
|
||||
|
|
Loading…
Reference in a new issue