Skip to content

Commit ccbba00

Browse files
committed
Merge branch 'main' into ps/state-traits
# Conflicts: # Cargo.lock # crates/bitwarden-uniffi/Cargo.toml # crates/bitwarden-vault/src/vault_client.rs # crates/bitwarden-wasm-internal/Cargo.toml # crates/bitwarden-wasm-internal/src/client.rs # crates/bitwarden-wasm-internal/src/vault/mod.rs
2 parents 9db11c6 + 38654e9 commit ccbba00

File tree

191 files changed

+1558
-891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+1558
-891
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
# Platform is the default owner for all files
88
* @bitwarden/team-platform-dev
99

10+
crates/bitwarden-vault/** @bitwarden/team-vault-dev @bitwarden/team-platform-dev
11+
1012
# BRE for publish workflow changes
1113
.github/workflows/publish-*.yml @bitwarden/dept-bre
1214
.github/workflows/release-rust-crates.yml @bitwarden/dept-bre

.github/workflows/build-wasm-internal.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
6363
- name: NPM setup
6464
run: npm ci
65+
working-directory: crates/bitwarden-wasm-internal/npm
6566

6667
- name: Install rust
6768
uses: dtolnay/rust-toolchain@56f84321dbccf38fb67ce29ab63e4754056677e0 # stable

.github/workflows/rust-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: cargo install wasm-bindgen-cli --version 0.2.100
7575

7676
- name: Test WASM
77-
run: cargo test --target wasm32-unknown-unknown -p bitwarden-wasm-internal -p bitwarden-threading -p bitwarden-error --all-features
77+
run: cargo test --target wasm32-unknown-unknown -p bitwarden-wasm-internal -p bitwarden-threading -p bitwarden-error -p bitwarden-uuid --all-features
7878

7979
coverage:
8080
name: Coverage

.github/workflows/scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
ref: ${{ github.event.pull_request.head.sha }}
7575

7676
- name: Scan with SonarCloud
77-
uses: sonarsource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
77+
uses: sonarsource/sonarqube-scan-action@2500896589ef8f7247069a56136f8dc177c27ccf # v5.2.0
7878
env:
7979
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
8080
with:

0 commit comments

Comments
 (0)