From 2e4545d5a617ef1abb5c6cc56bacd0da6e2fbbb2 Mon Sep 17 00:00:00 2001
From: mso7nueh <mso7nueh@mail.ru>
Date: Wed, 19 Jun 2024 17:02:12 +0300
Subject: [PATCH] feat(ci): <sdk>/cmdline-tools/latest/

---
 .gitea/workflows/build.yml | 12 ++++--------
 .gitea/workflows/test.yml  |  8 ++++----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 094a029a..7576d6e3 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -1,6 +1,6 @@
 name: Android Release
 
-on: [push, pull_request]
+on: [ push, pull_request ]
 
 env:
   flutter_version: "3.22.0"
@@ -27,10 +27,10 @@ jobs:
           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
-          mv cmdline-tools $HOME/Android/Sdk/
+          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"
 
@@ -91,7 +91,3 @@ jobs:
           APK_NAME="eatvio_app_${TIMESTAMP}.apk"
           mv build/app/outputs/flutter-apk/app-release.apk $APK_NAME
           echo "APK build finished $APK_NAME"
-
-# Runs a set of commands using the runners shell
-#      - name: Start release build
-#        run: flutter build appbundle
diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml
index 78bc049d..5d7443c9 100644
--- a/.gitea/workflows/test.yml
+++ b/.gitea/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Eatvio App Android Test
 
-on: [pull_request]
+on: [ pull_request ]
 
 env:
   flutter_version: "3.22.0"
@@ -27,10 +27,10 @@ jobs:
           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
-          mv cmdline-tools $HOME/Android/Sdk/
+          mkdir -p $HOME/Android/Sdk/cmdline-tools/latest
+          mv cmdline-tools/* $HOME/Android/Sdk/cmdline-tools/latest/
           export ANDROID_SDK_ROOT=$HOME/Android/Sdk
-          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/bin
+          export PATH=$PATH:$HOME/Android/Sdk/cmdline-tools/latest/bin
           yes | sdkmanager --licenses
           sdkmanager "platform-tools" "platforms;android-30" "build-tools;30.0.3"