Merge branch 'main' of github.com:bitwarden/sdk into ps/zeroize-decry…

…pted # Conflicts: # Cargo.lock # crates/bitwarden-crypto/Cargo.toml # crates/bitwarden-crypto/src/enc_string/symmetric.rs # crates/bitwarden-crypto/src/keys/device_key.rs # crates/bitwarden-crypto/src/keys/master_key.rs # crates/bitwarden/src/auth/login/access_token.rs # crates/bitwarden/src/client/encryption_settings.rs # crates/bitwarden/src/vault/cipher/attachment.rs # crates/bitwarden/src/vault/cipher/cipher.rs
bitwarden · Jan 26, 2024 · 3d247ad · 3d247ad
2 parents 18cf0d6 + bc995a8
commit 3d247ad
Show file tree

Hide file tree

Showing 23 changed files with 560 additions and 542 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -30,15 +30,15 @@ jobs:
       - name: Install rust
         uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248 # stable
         with:
-          toolchain: 1.67.0 # https://github.com/cross-rs/cross/issues/1222
+          toolchain: stable
 
       - name: Cache cargo registry
         uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
         with:
           key: ${{ matrix.settings.target }}-cargo
 
       - name: Install Cross
-        run: cargo install cross --locked
+        run: cargo install cross --locked --git https://github.com/cross-rs/cross.git --rev 185398b1b885820515a212de720a306b08e2c8c9
 
       - name: Build
         env:

diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
@@ -75,7 +75,7 @@ jobs:
 
       - name: Install Cross (aarch64-unknown-linux-gnu)
         if: ${{ matrix.settings.target == 'aarch64-unknown-linux-gnu' }}
-        run: cargo install cross --locked
+        run: cargo install cross --locked --git https://github.com/cross-rs/cross.git --rev 185398b1b885820515a212de720a306b08e2c8c9
 
       - name: Build
         if: ${{ matrix.settings.target != 'aarch64-unknown-linux-gnu' }}