From e72400760c680438496a3583a35ff16d2faea2a5 Mon Sep 17 00:00:00 2001
From: zyphlar <zyphlar@gmail.com>
Date: Mon, 12 Jan 2026 08:29:15 -0800
Subject: [PATCH] cache apt, upload all

Signed-off-by: zyphlar <zyphlar@gmail.com>
---
 .forgejo/workflows/android-check.yaml | 54 ++++++++++-----------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml
index b4f5f0961..d8beab447 100644
--- a/.forgejo/workflows/android-check.yaml
+++ b/.forgejo/workflows/android-check.yaml
@@ -44,15 +44,18 @@ jobs:
     env:
       JAVA_HOME: /usr/lib/jvm/java-21-openjdk-amd64
     steps:
+      - name: Get date for cache key
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+      - uses: https://github.com/awalsh128/cache-apt-pkgs-action@v1.6.0
+        with:
+          packages: cmake ninja-build qt6-base-dev qt6-declarative-dev qt6-positioning-dev libqt6svg6-dev optipng libfreetype-dev libharfbuzz-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev python3-pip zlib1g-dev git ccache openjdk-21-jdk
+          version: "${{ steps.date.outputs.date }}"
+
       - name: Install build dependencies
         shell: bash
         run: |
-          apt-get update -y
-          apt-get install -y \
-            cmake \
-            git \
-            python3-pip \
-            openjdk-21-jdk
           pip install "protobuf<3.21" --break-system-packages
           update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java
 
@@ -67,10 +70,6 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Get date for cache key
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
       - uses: actions/cache@v4
         with:
           path: "3party"
@@ -112,29 +111,18 @@ jobs:
       cancel-in-progress: true
 
     steps:
+      - name: Get date for cache key
+        id: date
+        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+      - uses: https://github.com/awalsh128/cache-apt-pkgs-action@v1.6.0
+        with:
+          packages: cmake ninja-build qt6-base-dev qt6-declarative-dev qt6-positioning-dev libqt6svg6-dev optipng libfreetype-dev libharfbuzz-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev python3-pip zlib1g-dev git ccache openjdk-21-jdk
+          version: "${{ steps.date.outputs.date }}"
+
       - name: Install build tools and dependencies
         shell: bash
         run: |
-          apt-get update -y
-          apt-get install -y \
-            cmake \
-            ninja-build \
-            qt6-base-dev \
-            qt6-declarative-dev \
-            qt6-positioning-dev \
-            libqt6svg6-dev \
-            optipng \
-            libfreetype-dev \
-            libharfbuzz-dev \
-            libxrandr-dev \
-            libxinerama-dev \
-            libxcursor-dev \
-            libxi-dev \
-            python3-pip \
-            zlib1g-dev \
-            git \
-            ccache \
-            openjdk-21-jdk
           pip install "protobuf<3.21" --break-system-packages
           update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java
 
@@ -149,10 +137,6 @@ jobs:
         with:
           fetch-depth: 200 # enough to get all commits for the current day
 
-      - name: Get date for cache key
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
       - uses: actions/cache@v4
         with:
           path: "3party"
@@ -183,5 +167,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: android-${{ matrix.flavor }}
-          path: android/app/build/outputs/apk/**/OrganicMaps-*.apk
+          path: android/app/build/outputs/apk/**/*.apk
           if-no-files-found: error