try another approach (don't know how it used to work but not with the global cached version) (#1797)
Omar Hatem committed
Dec 10, 2024 at 00:18 UTC
6744bb8d52099ee7f3689f9dd5b2c5a096c2b7fc
2 files changed
+21
-11
.github/workflows/cache_dependencies.yml
+7
-2
@@ -62,6 +62,7 @@ jobs:
62
/opt/android/cake_wallet/cw_haven/android/.cxx
63
/opt/android/cake_wallet/scripts/monero_c/release
64
key: ${{ hashFiles('**/prepare_moneroc.sh' ,'**/build_monero_all.sh' ,'**/cache_dependencies.yml') }}
65
+
66
- if: ${{ steps.cache-externals.outputs.cache-hit != 'true' }}
67
name: Generate Externals
68
run: |
@@ -69,12 +70,16 @@ jobs:
70
source ./app_env.sh cakewallet
71
./build_monero_all.sh
72
73
+ - name: Set up cache path
74
+ id: cache-path
75
+ run: echo "cache-file-path=/opt/android/cake_wallet/android/app/key.jks" >> $GITHUB_ENV
76
+
77
- name: Cache Keystore
78
id: cache-keystore
79
uses: actions/cache@v3
80
with:
76
- path: /opt/android/cake_wallet/android/app/key.jks
77
- key: $STORE_PASS
81
+ path: ${{ env.cache-file-path }}
82
+ key: keystore
83
84
- if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
85
name: Generate KeyStore
.github/workflows/pr_test_build_android.yml
+14
-9
@@ -115,15 +115,20 @@ jobs:
115
cd /opt/android/cake_wallet/scripts/android/
116
./build_mwebd.sh --dont-install
117
118
-# - name: Cache Keystore
119
-# id: cache-keystore
120
-# uses: actions/cache@v3
121
-# with:
122
-# path: /opt/android/cake_wallet/android/app/key.jks
123
-# key: $STORE_PASS
124
-#
125
-# - if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
126
- - name: Generate KeyStore
118
+
119
+ - name: Set up cache path
120
+ id: cache-path
121
+ run: echo "cache-file-path=/opt/android/cake_wallet/android/app/key.jks" >> $GITHUB_ENV
122
+
123
+ - name: Cache Keystore
124
+ id: cache-keystore
125
+ uses: actions/cache@v3
126
+ with:
127
+ path: ${{ env.cache-file-path }}
128
+ key: keystore
129
+
130
+ - if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
131
+ name: Generate KeyStore
132
run: |
133
cd /opt/android/cake_wallet/android/app
134
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