From 24aee1069b3fcc0439b7714478372ddfe9ff6ef2 Mon Sep 17 00:00:00 2001 From: Hinton Date: Mon, 21 Oct 2024 10:24:03 -0700 Subject: [PATCH] Fix workflows --- .github/workflows/build-android.yml | 8 ++++---- .github/workflows/rust-test.yml | 30 ----------------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 49ee2084..ab451e4b 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -91,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 ./sdk/android-armv7-linux-androideabi/libbitwarden_uniffi.so ./languages/kotlin/sdk/src/main/jniLibs/armeabi-v7a/libbitwarden_uniffi.so + mv ./sdk/android-aarch64-linux-android/libbitwarden_uniffi.so ./languages/kotlin/sdk/src/main/jniLibs/arm64-v8a/libbitwarden_uniffi.so + mv ./sdk/android-i686-linux-android/libbitwarden_uniffi.so ./languages/kotlin/sdk/src/main/jniLibs/x86/libbitwarden_uniffi.so + mv ./sdk/android-x86_64-linux-android/libbitwarden_uniffi.so ./languages/kotlin/sdk/src/main/jniLibs/x86_64/libbitwarden_uniffi.so - name: Generate bindings working-directory: languages/kotlin diff --git a/.github/workflows/rust-test.yml b/.github/workflows/rust-test.yml index 73f3aed7..68993bff 100644 --- a/.github/workflows/rust-test.yml +++ b/.github/workflows/rust-test.yml @@ -75,33 +75,3 @@ jobs: uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0 env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - wasm: - name: WASM - - runs-on: ubuntu-22.04 - - steps: - - name: Checkout - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1 - - - name: Install rust - uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a # stable - with: - toolchain: stable - targets: wasm32-unknown-unknown - - - name: Cache cargo registry - uses: Swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2.7.5 - - - name: Check - run: cargo check -p bitwarden-wasm-internal --target wasm32-unknown-unknown - - - name: Install wasm-pack - run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - - - name: Wasm-pack test firefox - run: wasm-pack test --headless --firefox crates/bitwarden-wasm-internal - - - name: Wasm-pack test chrome - run: wasm-pack test --headless --chrome crates/bitwarden-wasm-internal