From cddd44b197f0b322ffe58c95e4e3d305d3800f7e Mon Sep 17 00:00:00 2001
From: ITQ <itq.dev@ya.ru>
Date: Sat, 22 Nov 2025 07:30:59 +0300
Subject: [PATCH] ci: fix

---
 .gitlab-ci.yml      | 59 +++++++++++++++++++++------------------------
 settings.gradle.kts |  1 -
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c55c00e..a1ec63b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,46 +1,41 @@
-image: docker.io/eclipse-temurin:21
+image: eclipse-temurin:21-jdk
+
+variables:
+  ANDROID_COMPILE_SDK: "36"
+  ANDROID_BUILD_TOOLS: "36.0.0"
+  ANDROID_SDK_TOOLS: "11076708"
+
+before_script:
+  - apt-get update -qq && apt-get install -y wget tar unzip lib32stdc++6 lib32z1
+  - export ANDROID_SDK_ROOT="${PWD}/android-home"
+  - mkdir -p $ANDROID_SDK_ROOT/cmdline-tools
+  - wget -q -O $ANDROID_SDK_ROOT/cmdline-tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip"
+  - unzip -d $ANDROID_SDK_ROOT/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools.zip
+  - mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/tools || true
+  - export PATH=$PATH:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/
+  - sdkmanager --verbose --version
+  - yes | sdkmanager --licenses || true
+  - sdkmanager --verbose "platforms;android-${ANDROID_COMPILE_SDK}" "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS}" || true
+  - chmod +x ./gradlew
 
 stages:
   - build
   - test
 
-cache:
-  key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - .gradle/
-    - $HOME/Android/
+lintDebug:
+  stage: build
+  script:
+    - ./gradlew -Pci --console=plain :app:lintDebug -PbuildDir=lint
 
-before_script:
-  - apt-get update -y
-  - apt-get install -y wget unzip git
-  - wget https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip -O cmdline-tools.zip
-  - mkdir -p $HOME/Android/cmdline-tools
-  - unzip cmdline-tools.zip -d $HOME/Android/cmdline-tools
-  - yes | $HOME/Android/cmdline-tools/cmdline-tools/bin/sdkmanager --sdk_root=$HOME/Android "platform-tools" "platforms;android-33" "build-tools;33.0.2"
-  - export ANDROID_HOME=$HOME/Android
-  - export PATH=$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/latest/bin:$PATH
-
-build:
+assembleDebug:
   stage: build
   script:
     - ./gradlew assembleDebug
   artifacts:
     paths:
-      - app/build/outputs/apk/debug/*.apk
-    expire_in: 1 week
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+      - app/build/outputs/
 
-test:
+debugTests:
   stage: test
   script:
-    - ./gradlew test
-  artifacts:
-    paths:
-      - app/build/test-results/test/*.xml
-      - app/build/reports/tests/test/*.html
-    expire_in: 1 week
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - ./gradlew -Pci --console=plain :app:testDebug
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f1e7296..678d3ee 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,4 +25,3 @@ dependencyResolutionManagement {
 
 rootProject.name = "MoscowHackatonTemplate"
 include(":app")
- 
\ No newline at end of file