From efcb2ce2eee6b0e9982424568121e7c94b5a3537 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Mon, 18 Nov 2024 16:51:16 +0300
Subject: [PATCH] fix: cache 1

---
 .gitea/workflows/build.yml | 64 ++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 532317ec..a6d70a2a 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,15 +1,15 @@
-name: Android Release
+name: Eatvio App Android Test
 
-on: [ push, pull_request ]
+on: [ pull_request ]
 
 env:
-  flutter_version: "3.22.0"
-  java_version: "12.x"
+  flutter_version: "3.24.5"
+  java_version: "21.x"
   flutter_channel: "stable"
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: [ dev-office ]
 
     steps:
       - uses: actions/checkout@v3
@@ -17,8 +17,9 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: "zulu"
           java-version: ${{ env.java_version }}
+        id: setup-jdk
 
       - name: Install Android SDK
         run: |
@@ -30,46 +31,30 @@ jobs:
           mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
           export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
-          sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
-      - uses: actions/cache@v3
-        with:
-          path: |
-            /root/Android/Sdk
-          key: ${{ runner.os }}-sdk-
-          restore-keys: ${{ runner.os }}-sdk-
+          yes | sdkmanager --licenses 2>/dev/null || true                                
 
       - name: Set up Android environment variables
         run: |
           echo "ANDROID_SDK_ROOT=$HOME/Android/Sdk" >> $GITHUB_ENV
-          echo "PATH=$PATH:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
-          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV
+          echo "PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin:$HOME/Android/Sdk/platform-tools:$HOME/Android/Sdk/build-tools/30.0.3" >> $GITHUB_ENV
+          echo "ANDROID_HOME=$HOME/Android/Sdk" >> $GITHUB_ENV                              
 
-      - uses: actions/cache@v3
-        with:
-          path: ${{ runner.tool_cache }}/flutter
-          key: flutter-${{ env.flutter_version }}-${{ env.flutter_channel }}
+      - name: Install jq
+        run: |
+          apt-get install -y jq                              
 
       - id: flutter-action
         uses: actions/flutter-action@v2
         with:
           channel: ${{ env.flutter_channel }}
           flutter-version: ${{ env.flutter_version }}
+          cache: true
 
-      - name: show cache keys
-        run: |
-          echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
-          echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
-          echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
-          echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
-          echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
-          echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
-        shell: bash
-
-      - name: fix dir permissions
+      - name: Fix dir permissions
         run: |
           git config --global --add safe.directory /opt/hostedtoolcache/flutter/${{ env.flutter_channel }}-${{ env.flutter_version }}-${{ steps.flutter-action.outputs.ARCHITECTURE }}
-          flutter --version
+          flutter config --android-sdk="$ANDROID_HOME"
+          flutter doctor -v                              
 
       - name: Get dependencies
         run: flutter pub get
@@ -77,15 +62,13 @@ jobs:
       - name: Native Analyze
         run: flutter analyze
 
-      - name: Run Code Metrics
-        run: flutter pub run dart_code_metrics:metrics lib --disable-sunset-warning --fatal-warnings --fatal-performance
-
       - name: Test
         run: |
-          flutter test
+          flutter test                              
 
       - name: Build apk
-        run: flutter build apk
+        run: |
+          flutter build apk                              
 
       - name: Rename and move apk
         run: |
@@ -93,3 +76,10 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
+          echo "APK_NAME=$APK_NAME" >> $GITHUB_ENV                              
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.APK_NAME }}
+          path: ${{ env.APK_NAME }}