potential fix for cached jks

OmarHatem committed Dec 10, 2024 at 11:52 UTC 5553d5c9cbdcde8ff427b2ebb46cfddbbb07992a
2 files changed +14 -23
.github/workflows/cache_dependencies.yml
+1 -5
@@ -70,15 +70,11 @@ 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 -
73 - name: Cache Keystore
74 id: cache-keystore
75 uses: actions/cache@v3
76 with:
81 - path: ${{ env.cache-file-path }}
77 + path: /opt/android/cake_wallet/android/app
78 key: keystore
79
80 - if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
.github/workflows/pr_test_build_android.yml
+13 -18
@@ -61,6 +61,19 @@ jobs:
61 sudo apt update
62 sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
63
64 + - name: Cache Keystore
65 + id: cache-keystore
66 + uses: actions/cache@v3
67 + with:
68 + path: /opt/android/cake_wallet/android/app
69 + key: keystore
70 +
71 + - if: ${{ steps.cache-keystore.outputs.cache-hit != 'true' }}
72 + name: Generate KeyStore
73 + run: |
74 + cd /opt/android/cake_wallet/android/app
75 + 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
76 +
77 - name: Execute Build and Setup Commands
78 run: |
79 sudo mkdir -p /opt/android
@@ -115,24 +128,6 @@ jobs:
128 cd /opt/android/cake_wallet/scripts/android/
129 ./build_mwebd.sh --dont-install
130
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
135 -
131 - name: Generate key properties
132 run: |
133 cd /opt/android/cake_wallet