Skip to content

Commit 9841611

Browse files
authored
Merge branch 'v2.1' into mergify/bp/v2.1/pr-3423
2 parents 050fbc2 + 32b445a commit 9841611

File tree

81 files changed

+3100
-1689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3100
-1689
lines changed

.github/workflows/client-targets.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636

37+
# This can be removed once cargo-ndk >= 3.5.4 is used.
38+
- name: Setup environment for Android NDK
39+
run: |
40+
echo "RANLIB=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib" >> $GITHUB_ENV
41+
3742
- run: cargo install [email protected]
3843

3944
- name: Setup Rust

.github/workflows/downstream-project-spl.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ env:
3737

3838
jobs:
3939
check:
40-
if: github.repository == 'anza-xyz/agave'
40+
if: false
4141
runs-on: ubuntu-latest
4242
steps:
4343
- uses: actions/checkout@v4
@@ -61,6 +61,7 @@ jobs:
6161
cargo check
6262
6363
test:
64+
if: false
6465
runs-on: ubuntu-latest
6566
strategy:
6667
matrix:
@@ -123,6 +124,7 @@ jobs:
123124
done
124125
125126
cargo-test-sbf:
127+
if: false
126128
runs-on: ubuntu-latest
127129
strategy:
128130
matrix:

0 commit comments

Comments
 (0)