From 3aa2f20eef627aabc14bd9644d4db19ded91131b Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 15:58:52 +0300
Subject: [PATCH] fix: 1111

---
 .gitea/workflows/test.yml | 40 ++++++++++++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 37ceed52..c22a1059 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/zulu
-          key: jdk-${{ runner.os }}-java-${{ env.java_version }}
+          key: jdk-${{ runner.os }}-java-${{ env.java_version }}  # Ключ для JDK
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -27,25 +27,44 @@ jobs:
           java-version: ${{ env.java_version }}
         id: setup-jdk
 
+      - name: Cache cmdline-tools
+        uses: actions/cache@v3
+        with:
+          path: $HOME/Android/Sdk/cmdline-tools
+          key: android-cmdline-tools-${{ runner.os }}-sdk  # Ключ для cmdline-tools
+          restore-keys: |
+            android-cmdline-tools-${{ runner.os }}-sdk
+
       - name: Cache Android SDK
         uses: actions/cache@v3
         with:
           path: $HOME/Android/Sdk
-          key: android-sdk-${{ runner.os }}-sdk-${{ hashFiles('**/gradle-wrapper.properties') }}
+          key: android-sdk-${{ runner.os }}-sdk  # Ключ для Android SDK
           restore-keys: |
-            android-sdk-${{ runner.os }}-sdk-
+            android-sdk-${{ runner.os }}-sdk
+
+      - name: Cache Flutter SDK
+        uses: actions/cache@v3
+        with:
+          path: ~/.pub-cache  # Путь к кэшу Flutter SDK
+          key: flutter-${{ runner.os }}-${{ env.flutter_channel }}-${{ env.flutter_version }}
+          restore-keys: |
+            flutter-${{ runner.os }}-${{ env.flutter_channel }}-
 
       - name: Install Android SDK
         run: |
-          apt-get update
-          apt-get install -y openjdk-11-jdk wget
-          wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
-          unzip commandlinetools.zip
-          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
-          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
+          if [ ! -d "$HOME/Android/Sdk/cmdline-tools/latest" ]; then
+            apt-get update
+            apt-get install -y openjdk-11-jdk wget
+            wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip -O commandlinetools.zip
+            unzip commandlinetools.zip
+            mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+            mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
+          fi
+          
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          yes | sdkmanager --licenses 2>/dev/null || true                      
+          yes | sdkmanager --licenses 2>/dev/null || true    
 
       - name: Set up Android environment variables
         run: |
@@ -62,7 +81,6 @@ jobs:
         with:
           channel: ${{ env.flutter_channel }}
           flutter-version: ${{ env.flutter_version }}
-          cache: true
 
       - name: Fix dir permissions
         run: |