try another approach (don't know how it used to work but not with the…

… global cached version) (#1797)
cake-tech · Dec 9, 2024 · 6744bb8 · 6744bb8
1 parent 03ff228
commit 6744bb8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/cache_dependencies.yml b/.github/workflows/cache_dependencies.yml
@@ -62,19 +62,24 @@ 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: |
           cd /opt/android/cake_wallet/scripts/android/
           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
@@ -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