add missing android-35 dependency (#2101)
cyan committed
Mar 21, 2025 at 04:03 UTC
00642e6027954c060efab0addd0d7b523368fbf3
3 files changed
+11
-8
.github/workflows/pr_test_build_android.yml
+2
-2
@@ -9,7 +9,7 @@ jobs:
9
PR_test_build:
10
runs-on: linux-amd64
11
container:
12
- image: ghcr.io/cake-tech/cake_wallet:main-linux
12
+ image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
13
env:
14
STORE_PASS: test@cake_wallet
15
KEY_PASS: test@cake_wallet
@@ -307,4 +307,4 @@ jobs:
307
uses: actions/upload-artifact@v4
308
with:
309
path: ${{ github.workspace }}/build/app/outputs/flutter-apk
310
- name: "android apk"
\ No newline at end of file
310
+ name: "android apk"
.github/workflows/pr_test_build_linux.yml
+1
-1
@@ -9,7 +9,7 @@ jobs:
9
PR_test_build:
10
runs-on: linux-amd64
11
container:
12
- image: ghcr.io/cake-tech/cake_wallet:main-linux
12
+ image: ghcr.io/cake-tech/cake_wallet:3.24.4-linux
13
env:
14
STORE_PASS: test@cake_wallet
15
KEY_PASS: test@cake_wallet
Dockerfile
+8
-5
@@ -1,6 +1,6 @@
1
# Usage:
2
-# docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:main-linux
3
-# docker push ghcr.io/cake-tech/cake_wallet:main-linux
2
+# docker build . -f Dockerfile -t ghcr.io/cake-tech/cake_wallet:3.24.4-linux
3
+# docker push ghcr.io/cake-tech/cake_wallet:3.24.4-linux
4
5
# Heavily inspired by cirrusci images
6
# https://github.com/cirruslabs/docker-images-android/blob/master/sdk/tools/Dockerfile
@@ -23,7 +23,7 @@ ENV FLUTTER_VERSION=3.24.4
23
# Comes from https://developer.android.com/studio/#command-tools
24
ENV ANDROID_SDK_TOOLS_VERSION=11076708
25
# Comes from https://developer.android.com/studio/releases/build-tools
26
-ENV ANDROID_PLATFORM_VERSION=34
26
+ENV ANDROID_PLATFORM_VERSION=35
27
ENV ANDROID_BUILD_TOOLS_VERSION=34.0.0
28
29
# If we ever need to migrate the home directory...
@@ -106,6 +106,8 @@ RUN yes | sdkmanager \
106
"platforms;android-$ANDROID_PLATFORM_VERSION" \
107
"build-tools;$ANDROID_BUILD_TOOLS_VERSION" \
108
"platforms;android-33" \
109
+ "platforms;android-34" \
110
+ "platforms;android-35" \
111
"build-tools;33.0.2" \
112
"build-tools;33.0.1" \
113
"build-tools;33.0.0" \
@@ -118,10 +120,11 @@ RUN yes | sdkmanager "ndk;$ANDROID_NDK_VERSION" \
120
121
# Install dependencies for tests
122
# Comes from https://github.com/ReactiveCircus/android-emulator-runner
121
-RUN yes | sdkmanager "system-images;android-29;default;x86" \
123
+RUN yes | sdkmanager \
124
"system-images;android-29;default;x86_64" \
125
"system-images;android-31;default;x86_64" \
124
- "platforms;android-29"
126
+ "platforms;android-29" \
127
+ "platforms;android-31"
128
129
# Fake the KVM status so the Android emulator doesn't complain (that much)
130
RUN (addgroup kvm || true) && \