Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pull-request-token-lending.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ jobs:
override: true
profile: minimal

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}}

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cargo/bin/rustfilt
key: cargo-bpf-bins-${{ runner.os }}

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cache
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
profile: minimal
components: clippy

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
Expand Down Expand Up @@ -96,21 +96,21 @@ jobs:
override: true
profile: minimal

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
~/.cargo/git
# target # Removed due to build dependency caching conflicts
key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}}

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cargo/bin/rustfilt
key: cargo-bpf-bins-${{ runner.os }}

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cache
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
override: true
profile: minimal

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: |
~/.cargo/registry
Expand Down
1 change: 0 additions & 1 deletion ci/install-build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ sudo apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-1
sudo apt-get update
sudo apt-get install -y openssl --allow-unauthenticated
sudo apt-get install -y libssl-dev --allow-unauthenticated
sudo apt-get install -y libssl1.1 --allow-unauthenticated
sudo apt-get install -y libudev-dev
sudo apt-get install -y binutils-dev
sudo apt-get install -y libunwind-dev
6 changes: 4 additions & 2 deletions ci/solana-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
if [[ -n $SOLANA_VERSION ]]; then
solana_version="$SOLANA_VERSION"
else
solana_version=v1.16.20
# we use 1.16.20 for sdk but this version has been deleted from the solana servers so we use
# this version's CLI instead
solana_version=v1.17.34
fi

export solana_version="$solana_version"
Expand All @@ -23,7 +25,7 @@ export PATH="$HOME"/.local/share/solana/install/active_release/bin:"$PATH"
if [[ -n $1 ]]; then
case $1 in
install)
sh -c "$(curl -sSfL https://release.solana.com/$solana_version/install)"
sh -c "$(curl -sSfL https://release.anza.xyz/$solana_version/install)"
solana --version
;;
*)
Expand Down
2 changes: 1 addition & 1 deletion token-lending/program/src/processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2351,7 +2351,7 @@ fn process_withdraw_obligation_collateral_and_redeem_reserve_liquidity(
)?;

// Needed in the case where the obligation has no borrows => user doesn't refresh anything
// if the obligation has borrows, then withdraw_obligation_collateral ensures that the
// if the obligation has borrows, then withdraw_obligation_collateral ensures that the
// obligation (and as a result, the reserves) were refreshed
_refresh_reserve_interest(program_id, reserve_info, clock)?;
_redeem_reserve_collateral(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -315,4 +315,4 @@ async fn test_withdraw_no_borrows() {
)
.await
.unwrap();
}
}
Loading