From 71e9e228d3982972ec5969da17b8422bf93aa1a0 Mon Sep 17 00:00:00 2001
From: Kumi <git@kumi.email>
Date: Mon, 8 Jan 2024 12:17:12 +0100
Subject: [PATCH] Using different Docker image

---
 .gitlab-ci.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fa4af6..ff19d2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,18 +8,17 @@ variables:
 before_script:
   - apt update
   - apt install -y wget tar unzip bash
-  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
-  - unzip -d android-sdk-linux android-sdk.zip
-  - echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
-  - echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager "platform-tools" >/dev/null
-  - echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
+  - mkdir -p android-sdk-linux/cmdline-tools/latest
+  - wget --quiet --output-document=cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}_latest.zip
+  - unzip -d android-sdk-linux/cmdline-tools/latest cmdline-tools.zip
+  - mv android-sdk-linux/cmdline-tools/latest/cmdline-tools/* android-sdk-linux/cmdline-tools/latest
   - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
+  - export PATH=$PATH:$PWD/android-sdk-linux/cmdline-tools/latest/bin
+  - echo y | sdkmanager --licenses
+  - echo y | sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}"
+  - echo y | sdkmanager "platform-tools"
+  - echo y | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
   - chmod +x ./gradlew
-  # temporarily disable checking for EPIPE error and use yes to accept all licenses
-  - set +o pipefail
-  - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
-  - set -o pipefail
 
 stages:
   - build