From e0ce683a6568d431777db3c5a4581364c30f2564 Mon Sep 17 00:00:00 2001
From: Ilya Shulgin <13484957+Sateetas@users.noreply.github.com>
Date: Fri, 13 Dec 2024 22:35:46 +0200
Subject: [PATCH] test

---
 .github/workflows/tests.yml                     | 3 ++-
 Dockerfile                                      | 3 +--
 ci_resources/build_8gb_ram_ci_gradle.properties | 2 +-
 ci_resources/tests_8gb_ram_ci_gradle.properties | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 15ac7b86e1..31e7064999 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ concurrency:
 jobs:
   test:
     name: Test
-    runs-on: [ self-hosted, ARM64, active-android ]
+    runs-on: [ self-hosted, ARM64, Linux ]
     if: github.event.pull_request.draft == false
     steps:
       # temporary step, will be deleted soon
@@ -47,6 +47,7 @@ jobs:
           BUNDLE_PATH: vendor/bundle
         run: |
           docker run --rm \
+            -u ubuntu \
             -e GITHUB_TOKEN \
             -e GITHUB_ACTOR \
             -e BUNDLE_PATH \
diff --git a/Dockerfile b/Dockerfile
index ed146d3122..4fa62fd751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,8 +29,7 @@ RUN mkdir -p $ANDROID_HOME/cmdline-tools/latest && \
 
 RUN wget https://github.com/lzhiyong/android-sdk-tools/releases/download/34.0.3/android-sdk-tools-static-aarch64.zip -O /tmp/android-sdk-tools-static-aarch64.zip && \
     unzip /tmp/android-sdk-tools-static-aarch64.zip -d /tmp/android-sdk-tools-static-arm && \
-    mkdir $ANDROID_HOME/build-tools/34.0.0_aarch64 && \
-    cp -r /tmp/android-sdk-tools-static-arm/build-tools/* $ANDROID_HOME/build-tools/34.0.0_aarch64/ && \
+    cp -r /tmp/android-sdk-tools-static-arm/build-tools/* $ANDROID_HOME/build-tools/34.0.0/ && \
     rm -rf /tmp/android-sdk-tools-static-arm /tmp/android-sdk-tools-static-aarch64.zip
 
 RUN gem install bundler:2.5.23
diff --git a/ci_resources/build_8gb_ram_ci_gradle.properties b/ci_resources/build_8gb_ram_ci_gradle.properties
index 674a1fdbe7..45c763f199 100644
--- a/ci_resources/build_8gb_ram_ci_gradle.properties
+++ b/ci_resources/build_8gb_ram_ci_gradle.properties
@@ -8,7 +8,7 @@ org.gradle.caching=false
 
 android.useAndroidX=true
 android.nonTransitiveRClass=false
-android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0_aarch64/aapt2
+android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0/aapt2
 
 kotlin.incremental=false
 kotlin.compiler.execution.strategy=in-process
\ No newline at end of file
diff --git a/ci_resources/tests_8gb_ram_ci_gradle.properties b/ci_resources/tests_8gb_ram_ci_gradle.properties
index 46f7f2ae5f..78577a0975 100644
--- a/ci_resources/tests_8gb_ram_ci_gradle.properties
+++ b/ci_resources/tests_8gb_ram_ci_gradle.properties
@@ -8,6 +8,6 @@ org.gradle.caching=false
 
 android.useAndroidX=true
 android.nonTransitiveRClass=false
-android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0_aarch64/aapt2
+android.aapt2FromMavenOverride=/opt/android-sdk/build-tools/34.0.0/aapt2
 
 kotlin.incremental=false