Skip to content

Commit bcc9b27

Browse files
authored
CI fails due to outdated dependencies and wrong formatting (#212)
* Migrating CI cache dependency * Fixing formatting
1 parent ed2f77c commit bcc9b27

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

.github/workflows/pull-request-token-lending.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ jobs:
3030
override: true
3131
profile: minimal
3232

33-
- uses: actions/cache@v2
33+
- uses: actions/cache@v4
3434
with:
3535
path: |
3636
~/.cargo/registry
3737
~/.cargo/git
3838
key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}}
3939

40-
- uses: actions/cache@v2
40+
- uses: actions/cache@v4
4141
with:
4242
path: |
4343
~/.cargo/bin/rustfilt
4444
key: cargo-bpf-bins-${{ runner.os }}
4545

46-
- uses: actions/cache@v2
46+
- uses: actions/cache@v4
4747
with:
4848
path: |
4949
~/.cache

.github/workflows/pull-request.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
profile: minimal
6060
components: clippy
6161

62-
- uses: actions/cache@v2
62+
- uses: actions/cache@v4
6363
with:
6464
path: |
6565
~/.cargo/registry
@@ -96,21 +96,21 @@ jobs:
9696
override: true
9797
profile: minimal
9898

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

107-
- uses: actions/cache@v2
107+
- uses: actions/cache@v4
108108
with:
109109
path: |
110110
~/.cargo/bin/rustfilt
111111
key: cargo-bpf-bins-${{ runner.os }}
112112

113-
- uses: actions/cache@v2
113+
- uses: actions/cache@v4
114114
with:
115115
path: |
116116
~/.cache
@@ -143,7 +143,7 @@ jobs:
143143
override: true
144144
profile: minimal
145145

146-
- uses: actions/cache@v2
146+
- uses: actions/cache@v4
147147
with:
148148
path: |
149149
~/.cargo/registry

ci/install-build-deps.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ sudo apt-add-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-1
77
sudo apt-get update
88
sudo apt-get install -y openssl --allow-unauthenticated
99
sudo apt-get install -y libssl-dev --allow-unauthenticated
10-
sudo apt-get install -y libssl1.1 --allow-unauthenticated
1110
sudo apt-get install -y libudev-dev
1211
sudo apt-get install -y binutils-dev
1312
sudo apt-get install -y libunwind-dev

token-lending/program/src/processor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2351,7 +2351,7 @@ fn process_withdraw_obligation_collateral_and_redeem_reserve_liquidity(
23512351
)?;
23522352

23532353
// Needed in the case where the obligation has no borrows => user doesn't refresh anything
2354-
// if the obligation has borrows, then withdraw_obligation_collateral ensures that the
2354+
// if the obligation has borrows, then withdraw_obligation_collateral ensures that the
23552355
// obligation (and as a result, the reserves) were refreshed
23562356
_refresh_reserve_interest(program_id, reserve_info, clock)?;
23572357
_redeem_reserve_collateral(

token-lending/program/tests/withdraw_obligation_collateral_and_redeem_reserve_collateral.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,4 +315,4 @@ async fn test_withdraw_no_borrows() {
315315
)
316316
.await
317317
.unwrap();
318-
}
318+
}

0 commit comments

Comments
 (0)