chore: split up sdkmanager install to prevent GHA runner from full disk

legobeat · Oct 10, 2024 · a423f91 · a423f91
1 parent c3a44cf
commit a423f91
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/imags/node-runner/Containerfile.android b/imags/node-runner/Containerfile.android
@@ -21,7 +21,7 @@ COPY --from=androidsdk --chown=$UID:$GID /home/user/.java /home/user/.java
 #COPY --from=androidsdk --chown=$UID:$GID /home/user/.android /home/user/.android
 
 
-ARG ANDROID_SDK_VERSION=33
+ARG ANDROID_SDK_VERSION=34
 ARG ANDROID_BUILD_TOOLS_VERSION=${ANDROID_SDK_VERSION}.0.0
 ARG ANDROID_NDK_VERSION=24.0.8215888
 ARG CMAKE_VERSION=3.22.1
@@ -30,17 +30,19 @@ ENV PATH=/home/user/Android/Sdk/cmdline-tools/latest/bin:/home/user/Android/Sdk/
 ##ARG ANDROID_IMAGE="system-images;android-34;default;arm64-v8a"
 #ARG ANDROID_IMAGE="system-images;android-34;default;x86_64"
 # download sdk and ndk
+RUN sdkmanager --install \
+    "cmake;${CMAKE_VERSION}"
 RUN sdkmanager --install \
     ## metamask-mobile legacy dep \
     "build-tools;30.0.3" \
     "build-tools;33.0.0" \
-    "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
-    "cmake;${CMAKE_VERSION}" \
-    #"platform-tools" \
-    ## metamask-mobile legacy dep \
-    "platforms;android-33" \
+    "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"
+RUN sdkmanager --install \
+    ##"platform-tools" \
+    ### metamask-mobile legacy dep \
+    #"platforms;android-33" \
     "platforms;android-${ANDROID_SDK_VERSION}" \
-    #"sources;android-${ANDROID_SDK_VERSION}" \
+    ##"sources;android-${ANDROID_SDK_VERSION}" \
     "ndk;${ANDROID_NDK_VERSION}"
 
 ENV ANDROID_AVD_HOME=/home/user/.config/.android/avd