From 35a54ef6ca104948217e80aadaf99ae250e989a9 Mon Sep 17 00:00:00 2001
From: proletarius101 <proletarius101@protonmail.com>
Date: Thu, 14 Jul 2022 16:34:31 +0000
Subject: [PATCH] fix .gradle not able to be uploaded

---
 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3379ffda4..f41bf77838 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
   - export PYTHONUNBUFFERED=true
 
 .install_sdkmanager: &install_sdkmanager
-  - curl -Lo /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_CMDLINE_TOOLS}.zip"
+  - curl -Lo /tmp/cmdline-tools.zip -t 5 "https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_CMDLINE_TOOLS}_latest.zip"
   - echo "${ANDROID_CMDLINE_TOOLS_SHA256} /tmp/cmdline-tools.zip" | sha256sum -c -
   - unzip -q -o /tmp/cmdline-tools.zip -d /tmp/cmdline-tools
   - mkdir -p ${ANDROID_HOME}/cmdline-tools/tools
@@ -259,7 +259,7 @@ fdroid build:
   cache:
     key: "$CI_JOB_NAME"
     paths:
-      - /home/vagrant/.gradle
+      - .gradle
   variables: 
     ANDROID_HOME: /opt/android-sdk
     ANDROID_SDK_ROOT: ${ANDROID_HOME}
@@ -288,6 +288,9 @@ fdroid build:
       done
     - ln -s $home_vagrant/build $CI_PROJECT_DIR/build
 
+    # make sure .gradle stores inside $CI_PROJECT_DIR to make it cacheable
+    - ln -s $home_vagrant/.gradle $CI_PROJECT_DIR/.gradle
+
     - export GRADLE_USER_HOME=$home_vagrant/.gradle
     # each `fdroid build --on-server` run expects sudo, then uninstalls it
     - export fdroid="sudo --preserve-env --user vagrant