From 6744bb8d52099ee7f3689f9dd5b2c5a096c2b7fc Mon Sep 17 00:00:00 2001
From: Omar Hatem <omarh.ismail1@gmail.com>
Date: Tue, 10 Dec 2024 00:18:00 +0200
Subject: [PATCH] try another approach (don't know how it used to work but not
 with the global cached version) (#1797)

---
 .github/workflows/cache_dependencies.yml    |  9 ++++++--
 .github/workflows/pr_test_build_android.yml | 23 +++++++++++++--------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/cache_dependencies.yml b/.github/workflows/cache_dependencies.yml
index 938027e81..014afdcad 100644
--- a/.github/workflows/cache_dependencies.yml
+++ b/.github/workflows/cache_dependencies.yml
@@ -62,6 +62,7 @@ jobs:
             /opt/android/cake_wallet/cw_haven/android/.cxx
             /opt/android/cake_wallet/scripts/monero_c/release
           key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh' ,'**/cache_dependencies.yml') }}
+
       - if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
         name: Generate Externals
         run: |
@@ -69,12 +70,16 @@ jobs:
           source ./app_env.sh cakewallet
           ./build_monero_all.sh
 
+      - name: Set up cache path
+        id: cache-path
+        run: echo "cache-file-path=/opt/android/cake_wallet/android/app/key.jks" >> $GITHUB_ENV
+
       - name: Cache Keystore
         id: cache-keystore
         uses: actions/cache@v3
         with:
-          path: /opt/android/cake_wallet/android/app/key.jks
-          key: $STORE_PASS
+          path: ${{ env.cache-file-path }}
+          key: keystore
 
       - if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
         name: Generate KeyStore
diff --git a/.github/workflows/pr_test_build_android.yml b/.github/workflows/pr_test_build_android.yml
index 9df11f7ab..d128d2a1a 100644
--- a/.github/workflows/pr_test_build_android.yml
+++ b/.github/workflows/pr_test_build_android.yml
@@ -115,15 +115,20 @@ jobs:
           cd /opt/android/cake_wallet/scripts/android/
           ./build_mwebd.sh --dont-install
 
-#      - name: Cache Keystore
-#        id: cache-keystore
-#        uses: actions/cache@v3
-#        with:
-#          path: /opt/android/cake_wallet/android/app/key.jks
-#          key: $STORE_PASS
-#
-#      - if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
-      - name: Generate KeyStore
+
+      - name: Set up cache path
+        id: cache-path
+        run: echo "cache-file-path=/opt/android/cake_wallet/android/app/key.jks" >> $GITHUB_ENV
+
+      - name: Cache Keystore
+        id: cache-keystore
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.cache-file-path }}
+          key: keystore
+
+      - if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
+        name: Generate KeyStore
         run: |
           cd /opt/android/cake_wallet/android/app
           keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass $STORE_PASS -keypass $KEY_PASS