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

anza-xyz · Dec 5, 2024 · 9841611 · 9841611
2 parents 050fbc2 + 32b445a
commit 9841611
Show file tree

Hide file tree

Showing 81 changed files with 3,100 additions and 1,689 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 [email protected]
 
       - name: Setup Rust

diff --git a/.github/workflows/downstream-project-spl.yml b/.github/workflows/downstream-project-spl.yml
@@ -37,7 +37,7 @@ env:
 
 jobs:
   check:
-    if: github.repository == 'anza-xyz/agave'
+    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -61,6 +61,7 @@ jobs:
           cargo check
 
   test:
+    if: false
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -123,6 +124,7 @@ jobs:
           done
 
   cargo-test-sbf:
+    if: false
     runs-on: ubuntu-latest
     strategy:
       matrix: