Skip to content

Commit

Permalink
Merge branch 'main' of github.com:bitwarden/sdk into ps/split-phase1
Browse files Browse the repository at this point in the history
# Conflicts:
#	crates/sdk-schemas/Cargo.toml
  • Loading branch information
Hinton committed Oct 10, 2024
2 parents 1285a45 + 7e663e9 commit 9dc0e90
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 79 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/build-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,13 @@ jobs:
working-directory: languages/cpp
shell: bash
run: |
mv include/release/* include/
if [[ '${{ runner.os }}' == 'macOS' || '${{ runner.os }}' == 'Linux' ]]; then
ls include/libbitwarden_c.* || { echo "Missing libbitwarden_c.*"; exit 1; }
fi
if [[ '${{ runner.os }}' == 'Windows' ]]; then
ls include/bitwarden_c.dll || { echo "Missing bitwarden_c.dll"; exit 1; }
ls include/bitwarden_c.dll.lib || { echo "Missing bitwarden_c.dll.lib"; exit 1; }
fi
rmdir include/release
- name: Build unix
working-directory: languages/cpp
Expand Down
12 changes: 0 additions & 12 deletions crates/bitwarden-uniffi/README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
# Bitwarden-uniffi

## Generating documentation

If desired we have some scripts that generates markdown documentation from the rustdoc output.

```bash
cargo +nightly rustdoc -p bitwarden -- -Zunstable-options --output-format json
cargo +nightly rustdoc -p bitwarden-uniffi -- -Zunstable-options --output-format json
npm run schemas

npx ts-node ./support/docs/docs.ts > doc.md
```
64 changes: 0 additions & 64 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
},
"devDependencies": {
"@openapitools/openapi-generator-cli": "2.13.4",
"handlebars": "^4.7.8",
"prettier": "3.3.3",
"quicktype-core": "23.0.170",
"rimraf": "6.0.1",
Expand Down

0 comments on commit 9dc0e90

Please sign in to comment.