Skip to content

Commit dbadf9d

Browse files
authored
Merge pull request #79 from heyAyushh/fix-cargo-native
fix solana-program versions, edited workflows
2 parents 89fb4f9 + 33539cd commit dbadf9d

File tree

20 files changed

+56
-137
lines changed

20 files changed

+56
-137
lines changed

.github/workflows/anchor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Anchor
22

33
on:
44
schedule:
5-
- cron: "0 0 * * *"
5+
- cron: '0 0 * * *'
66
push:
77
branches:
88
- main
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
node-version: [20.x]
20-
solana-version: [stable, 1.17.25]
20+
solana-version: [1.18.8, beta]
2121
anchor-version: [0.30.0]
2222
steps:
2323
- uses: actions/checkout@v4

.github/workflows/solana-native.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Native
22

33
on:
44
schedule:
5-
- cron: "0 0 * * *"
5+
- cron: '0 0 * * *'
66
push:
77
branches:
88
- main
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
node-version: [20.x]
20-
solana-version: [stable, 1.18.4]
20+
solana-version: [1.17.25, stable, beta]
2121
steps:
2222
- uses: actions/checkout@v4
2323
- name: Use Node.js ${{ matrix.node-version }}
@@ -79,7 +79,7 @@ jobs:
7979
strategy:
8080
matrix:
8181
node-version: [20.x]
82-
solana-version: [stable, 1.18.4]
82+
solana-version: [1.17.25, stable, beta]
8383
steps:
8484
- uses: actions/checkout@v4
8585
- name: Use Node.js ${{ matrix.node-version }}
@@ -133,7 +133,7 @@ jobs:
133133
echo "*****************************"
134134
echo "Programs that failed testing:"
135135
printf "%s\n" "${failed_tests[@]}"
136-
# exit 1
136+
exit 1
137137
else
138138
echo "All tests passed."
139139
fi

Cargo.lock

Lines changed: 31 additions & 113 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ members = [
2323
"basics/program-derived-addresses/native/program",
2424
"basics/program-derived-addresses/anchor/programs/*",
2525
"basics/realloc/native/program",
26+
"basics/realloc/anchor/programs/*",
2627
"basics/rent/native/program",
2728
"basics/rent/anchor/programs/*",
2829
"basics/repository-layout/native/program",
2930
"basics/repository-layout/anchor/programs/*",
3031
"basics/transfer-sol/native/program",
31-
"basics/transfer-sol/anchor/programs/*"
32+
"basics/transfer-sol/anchor/programs/*",
3233
]
3334
resolver = "2"

basics/account-data/native/program/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
solana-program = "1.16.10"
7+
solana-program = "=1.17.25"
88
borsh = "0.9.3"
99
borsh-derive = "0.9.1"
1010

basics/checking-accounts/native/program/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
solana-program = "1.10.12"
7+
solana-program = "=1.17.25"
88

99
[lib]
1010
crate-type = ["cdylib", "lib"]

basics/close-account/native/program/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66
[dependencies]
77
borsh = "0.9.3"
88
borsh-derive = "0.9.1"
9-
solana-program = "1.16.10"
9+
solana-program = "=1.17.25"
1010

1111
[lib]
1212
crate-type = ["cdylib", "lib"]

0 commit comments

Comments
 (0)