Change caching logic for rs-core jobs

Author: markharding

.gitlab-ci.yml

@@ -16,6 +16,9 @@ stages:
   - publish
   - deploy
   - test
+variables:
+  CARGO_HOME: ${CI_PROJECT_DIR}/.cargo
+  CARGO_TARGET_DIR: ${CI_PROJECT_DIR}/target
 default:
   tags:
     - dind_fast

.gitlab/ci/build_rn_sdk.yml

@@ -24,10 +24,19 @@ rn-android-build:
   cache:
     - key:
         files:
+          - packages/rs-core/Cargo.lock
+        prefix: rs-core-cargo-deps
+      paths:
+        - .cargo/registry/index
+        - .cargo/registry/cache
+        - .cargo/git/db
+    - key:
+        files:
+          - packages/rs-core/Cargo.lock
           - pnpm-lock.yaml
-        prefix: ubrn-target
+        prefix: rs-core-target-${CI_JOB_NAME}
       paths:
-        - node_modules/.pnpm/uniffi-bindgen-react-native@*/node_modules/uniffi-bindgen-react-native/target
+        - target
   script:
     - cd packages/react-native
     - |

.gitlab/ci/build_rs_core.yml

@@ -15,7 +15,6 @@
         - .gitlab/ci/build_rs_core.yml
   variables:
     RUST_CORE_PATH: packages/rs-core
-    CARGO_HOME: ${CI_PROJECT_DIR}/.cargo
   cache:
     - key:
         files:
@@ -76,15 +75,10 @@ rs-core-uniffi-web-build:
     - key:
         files:
           - packages/rs-core/Cargo.lock
+          - pnpm-lock.yaml
         prefix: rs-core-target-${CI_JOB_NAME}
       paths:
         - target
-    - key:
-        files:
-          - pnpm-lock.yaml
-        prefix: ubrn-target
-      paths:
-        - node_modules/.pnpm/uniffi-bindgen-react-native@*/node_modules/uniffi-bindgen-react-native/target
   script:
     - cd packages/rs-core-uniffi-web
     - |