Skip to content

Commit

Permalink
Merge branch 'main' of github.com:bitwarden/sdk into ps/remove-internal
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build-android.yml
#	.github/workflows/build-swift.yml
#	.github/workflows/build-wasm-internal.yml
#	.github/workflows/delete-old-packages.yml
#	.github/workflows/memory-testing.yml
#	.github/workflows/publish-internal.yml
#	.github/workflows/release-swift.yml
#	crates/bitwarden-exporters/resources/json_export.json
#	crates/bitwarden-exporters/src/json.rs
#	crates/bitwarden-exporters/src/lib.rs
#	crates/bitwarden-exporters/src/models.rs
#	crates/bitwarden-vault/src/cipher/attachment.rs
#	crates/bitwarden-vault/src/cipher/cipher.rs
#	crates/bitwarden-vault/src/cipher/mod.rs
#	crates/bitwarden-vault/src/mobile/client_ciphers.rs
#	crates/bitwarden-vault/src/totp.rs
  • Loading branch information
Hinton committed Oct 21, 2024
2 parents 9e91f24 + 38ecf13 commit 9e3a9db
Show file tree
Hide file tree
Showing 24 changed files with 1 addition and 36 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-cli-docker.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build bws Docker image

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build CLI

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-java.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Java SDK

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-napi.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build @bitwarden/sdk-napi

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-python-wheels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Python Wheels

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-ruby.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Ruby

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build-rust-crates.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Rust crates

on:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build-wasm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build @bitwarden/sdk-wasm

on:
Expand Down Expand Up @@ -37,7 +36,7 @@ jobs:
- name: Install rust
uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a # stable
with:
toolchain: stable
toolchain: 1.81.0
targets: wasm32-unknown-unknown

- name: Cache cargo registry
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/direct-minimal-versions.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Direct Minimum Version

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/enforce-labels.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Enforce PR labels

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/minimum-rust-version.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Minimum Rust Version

on:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-bws.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish bws CLI
run-name: Publish bws CLI ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-java.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish Java SDK
run-name: Publish Java SDK ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-napi.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish @bitwarden/sdk-napi
run-name: Publish @bitwarden/sdk-napi ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-php.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish PHP SDK
run-name: Publish PHP SDK ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-python.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish Python SDK
run-name: Publish Python SDK ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-rust-crates.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish Rust crates
run-name: Publish Rust crates ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-wasm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Publish @bitwarden/sdk-wasm
run-name: Publish @bitwarden/sdk-wasm ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-bws.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release bws CLI
run-name: Release bws CLI ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-napi.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release @bitwarden/sdk-napi
run-name: Release @bitwarden/sdk-napi ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-python.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release Python SDK
run-name: Release Python SDK ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release-wasm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Release @bitwarden/sdk-wasm
run-name: Release @bitwarden/sdk-wasm ${{ inputs.release_type }}

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/version-bump.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Version Bump
run-name: Version Bump - ${{ inputs.project }} - v${{ inputs.version_number }}

Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/workflow-linter.yml

This file was deleted.

0 comments on commit 9e3a9db

Please sign in to comment.