Skip to content

Commit

Permalink
Merge branch 'main' into ps/secure-crypto-service
Browse files Browse the repository at this point in the history
  • Loading branch information
dani-garcia committed Oct 22, 2024
2 parents f4ca816 + 3800954 commit 748ba75
Show file tree
Hide file tree
Showing 320 changed files with 914 additions and 20,007 deletions.
8 changes: 4 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.{ts}]
quote_type = single
[*.ts]
quote_type = double

[*.{rs}]
[*.rs]
indent_style = space
indent_size = 4

[*.{kt,java,xml,gradle}]
indent_style = space
indent_size = 4

[*.{xml}]
[*.xml]
# VS Code XML extension removes the final newline
insert_final_newline = false
21 changes: 11 additions & 10 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
#
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

# BRE for publish workflow changes
.github/workflows/publish-*.yml @bitwarden/dept-bre

# DevOps for Actions and other workflow changes.
.github/workflows @bitwarden/dept-devops
# Shared workflows ownership

# Secrets Manager team
crates/bitwarden-sm @bitwarden/team-secrets-manager-dev
crates/bws @bitwarden/team-secrets-manager-dev

# BRE Automations
crates/bws/Cargo.toml
crates/bws/scripts/install.ps1
crates/bws/scripts/install.sh
## Multiple owners
.github/workflows/build-android.yml
.github/workflows/build-rust-crates.yml
.github/workflows/build-swift.yml
.github/workflows/build-wasm-internal.yml
.github/workflows/release-rust-crates.yml
.github/workflows/release-swift.yml
.github/workflows/version-bump.yml
90 changes: 0 additions & 90 deletions .github/ISSUE_TEMPLATE/cli.yml

This file was deleted.

14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/config.yml

This file was deleted.

78 changes: 0 additions & 78 deletions .github/ISSUE_TEMPLATE/sdk.yml

This file was deleted.

21 changes: 10 additions & 11 deletions .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Build Android

on:
Expand All @@ -25,15 +24,15 @@ jobs:
- target: i686-linux-android
steps:
- name: Checkout repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1

- name: Install rust
uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a # stable
with:
toolchain: stable

- name: Cache cargo registry
uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
with:
key: ${{ matrix.settings.target }}-cargo

Expand All @@ -46,7 +45,7 @@ jobs:
run: cross build -p bitwarden-uniffi --release --target=${{ matrix.settings.target }}

- name: Upload artifact
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: android-${{ matrix.settings.target }}
path: ./target/${{ matrix.settings.target }}/release/libbitwarden_uniffi.so
Expand All @@ -57,14 +56,14 @@ jobs:
needs: build
steps:
- name: Checkout repo (PR)
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
if: github.event_name == 'pull_request'
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}

- name: Checkout repo (Push)
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
if: github.event_name == 'push'
with:
fetch-depth: 0
Expand All @@ -75,7 +74,7 @@ jobs:
toolchain: stable

- name: Cache cargo registry
uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5
with:
key: cargo-combine-cache

Expand All @@ -92,10 +91,10 @@ jobs:
working-directory: languages/kotlin/sdk/src/main/jniLibs
run: |
mkdir armeabi-v7a arm64-v8a x86 x86_64
mv /home/runner/work/sdk/sdk/android-armv7-linux-androideabi/libbitwarden_uniffi.so ./armeabi-v7a/libbitwarden_uniffi.so
mv /home/runner/work/sdk/sdk/android-aarch64-linux-android/libbitwarden_uniffi.so ./arm64-v8a/libbitwarden_uniffi.so
mv /home/runner/work/sdk/sdk/android-i686-linux-android/libbitwarden_uniffi.so ./x86/libbitwarden_uniffi.so
mv /home/runner/work/sdk/sdk/android-x86_64-linux-android/libbitwarden_uniffi.so ./x86_64/libbitwarden_uniffi.so
mv /home/runner/work/sdk-internal/sdk-internal/android-armv7-linux-androideabi/libbitwarden_uniffi.so ./armeabi-v7a/libbitwarden_uniffi.so
mv /home/runner/work/sdk-internal/sdk-internal/android-aarch64-linux-android/libbitwarden_uniffi.so ./arm64-v8a/libbitwarden_uniffi.so
mv /home/runner/work/sdk-internal/sdk-internal/android-i686-linux-android/libbitwarden_uniffi.so ./x86/libbitwarden_uniffi.so
mv /home/runner/work/sdk-internal/sdk-internal/android-x86_64-linux-android/libbitwarden_uniffi.so ./x86_64/libbitwarden_uniffi.so
- name: Generate bindings
working-directory: languages/kotlin
Expand Down
Loading

0 comments on commit 748ba75

Please sign in to comment.