Merge pull request #1 from LionZXY/feature/android_warmup

Android warmup
flipperdevices · Jul 29, 2024 · d8557df · d8557df
2 parents 103ee83 + 0a0ff44
commit d8557df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,6 +32,7 @@ jobs:
           echo "image_name=${IMAGE_NAME}" >> $GITHUB_OUTPUT
 
       - name: 'Login to Docker Hub'
+        if: ${{ github.event_name != 'pull_request' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.REGISTRY_USER }}

diff --git a/android/Dockerfile b/android/Dockerfile
@@ -5,9 +5,9 @@ RUN DEBIAN_FRONTEND=noninteractive sudo apt update && sudo apt -y install wget a
 RUN sudo mkdir -p /opt/archives
 
 # OpenJDK17 temurin
-RUN sudo wget https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz -O /opt/archives/openjdk.tar.gz # https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.11%2B9
+RUN sudo wget https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz -O /opt/archives/openjdk.tar.gz # https://github.com/adoptium/temurin17-binaries/releases/tag/jdk-17.0.12%2B7
 RUN sudo tar -xvf /opt/archives/openjdk.tar.gz -C /opt/
-ENV JAVA_HOME=/opt/jdk-17.0.11+9
+ENV JAVA_HOME=/opt/jdk-17.0.12+7
 ENV PATH=$JAVA_HOME/bin:$PATH
 
 # Android Studio CommandLine Tools
@@ -23,12 +23,15 @@ RUN yes | sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --licenses
 RUN sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager tools platform-tools
 ENV PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$ANDROID_SDK_ROOT/platform-tools:$PATH
 
-# Gradle
-RUN sudo wget https://services.gradle.org/distributions/gradle-8.9-bin.zip -O /opt/archives/gradle-8.9-bin.zip
-RUN sudo unzip /opt/archives/gradle-8.9-bin.zip -d /opt
-ENV GRADLE_HOME=/opt/gradle-8.9
-ENV PATH=$GRADLE_HOME/bin:$PATH
-
 RUN sudo mkdir -p "/etc/docker"
 RUN echo "{\"mtu\": 1454}" | sudo tee -a /etc/docker/daemon.json > /dev/null
 RUN sudo chown -R runner:runner /opt/android_sdk/
+
+# Optimization block
+# Preinstall platform API 34
+# https://github.com/flipperdevices/Flipper-Android-App/blob/e895e199f40c81a53f6f65e91b27afa590cb2e43/build-logic/plugins/convention/src/main/kotlin/com/flipperdevices/buildlogic/ApkConfig.kt#L12
+RUN sdkmanager --install "platforms;android-34"
+
+# Warmup project
+RUN git clone --recurse-submodules https://github.com/flipperdevices/Flipper-Android-App.git -b 1.7.1.1656 /tmp/android-warmup/
+RUN cd /tmp/android-warmup/ && ./gradlew assembleDebug && rm -rf /tmp/android-warmup/