Merge branch 'v2.1' into mergify/bp/v2.1/pr-3478

anza-xyz · Nov 22, 2024 · 6d2966a · 6d2966a
2 parents 6b0a5d8 + cefd3f1
commit 6d2966a
Show file tree

Hide file tree

Showing 40 changed files with 1,988 additions and 1,043 deletions.
diff --git a/.github/workflows/client-targets.yml b/.github/workflows/client-targets.yml
@@ -34,6 +34,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      # This can be removed once cargo-ndk >= 3.5.4 is used.
+      - name: Setup environment for Android NDK
+        run: |
+          echo "RANLIB=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib" >> $GITHUB_ENV
+
       - run: cargo install cargo-ndk@2.12.2
 
       - name: Setup Rust