bump to automerge core 0.5.12

automerge · Oct 21, 2024 · db45b15 · db45b15
1 parent 6eb0de3
commit db45b15
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -26,7 +26,7 @@ jobs:
             automergeFFI.xcframework.zip
             libuniffi_automerge.a
             libuniffi_automerge_threads.a
-          key: automerge-dependencies-{{ hashFiles(AutomergeUniffi/automerge.swift) }}
+          key: automerge-dependencies-{{ hashFiles(AutomergeUniffi/automerge.swift) }}-{{ hashFiles(rust/Cargo.lock) }}
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
@@ -39,6 +39,7 @@ jobs:
         if: steps.cache-automerge.outputs.cache-hit != 'true'
         run: ./scripts/compress-framework.sh
       - uses: actions/upload-artifact@v4
+        if: steps.cache-automerge.outputs.cache-hit != 'true'
         with:
           name: libuniffi_automerge
           path: |
@@ -58,7 +59,7 @@ jobs:
             automergeFFI.xcframework.zip
             libuniffi_automerge.a
             libuniffi_automerge_threads.a
-          key: automerge-dependencies-{{ hashFiles(AutomergeUniffi/automerge.swift) }}
+          key: automerge-dependencies-{{ hashFiles(AutomergeUniffi/automerge.swift) }}-{{ hashFiles(rust/Cargo.lock) }}
       - name: Get swift version
         run: swift --version
       - name: Swift tests
@@ -84,7 +85,7 @@ jobs:
             automergeFFI.xcframework.zip
             libuniffi_automerge.a
             libuniffi_automerge_threads.a
-          key: automerge-dependencies-{{ hashFiles(AutomergeUniffi/automerge.swift) }}
+          key: automerge-dependencies-{{ hashFiles(AutomergeUniffi/automerge.swift) }}-{{ hashFiles(rust/Cargo.lock) }}
       - name: Cache SDK for WebAssembly
         id: cache-wasm-sdk
         uses: actions/cache@v4

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -13,7 +13,7 @@ path = "uniffi-bindgen.rs"
 required-features = ["uniffi/cli"]
 
 [dependencies]
-automerge = { version = "0.5.11", default-features = false, features = ["wasm"] }
+automerge = { version = "0.5.12", default-features = false, features = ["wasm"] }
 thiserror = "1.0.38"
 uniffi = "0.28.2"