Skip to content

Commit 8e0ed0a

Browse files
authored
CI: Update to Solana v2.1 crates (solana-labs#7416)
* Run update script, update curve25519-dalek dep, rust * Run clippy + fmt * Add workspace lints, start fixing doc comments * Update doc comments for clippy * Re-run cargo fmt after doc comment update * Update solana-version * Update CI jobs
1 parent 5ee8156 commit 8e0ed0a

File tree

154 files changed

+1898
-936
lines changed

Some content is hidden

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

154 files changed

+1898
-936
lines changed

.github/workflows/pull-request-account-compression.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ jobs:
3232

3333
- name: Set env vars
3434
run: |
35+
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
36+
echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
3537
source ci/rust-version.sh
3638
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
3739
source ci/solana-version.sh
38-
echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
3940
source ci/install-anchor.sh
4041
echo "ANCHOR_CLI_VERSION=$anchor_cli_version" >> $GITHUB_ENV
4142
@@ -94,4 +95,6 @@ jobs:
9495
key: node-${{ hashFiles('pnpm-lock.yaml') }}
9596
restore-keys: |
9697
node-
98+
- name: Set env vars
99+
run: echo "SOLANA_VERSION=v2.0.14" >> $GITHUB_ENV
97100
- run: ./ci/js-test-account-compression.sh

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,14 @@ jobs:
205205

206206
- name: Set env vars
207207
run: |
208-
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
209208
source ci/rust-version.sh
210209
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
211210
source ci/solana-version.sh
212211
echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV
213212
214213
- uses: dtolnay/rust-toolchain@master
215214
with:
216-
toolchain: ${{ env.RUST_STABLE_VERSION }}
215+
toolchain: ${{ env.RUST_STABLE }}
217216

218217
- uses: actions/cache@v4
219218
with:

Anchor.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[toolchain]
22
anchor_version = "0.29.0"
3-
solana_version = "2.0.3"
3+
solana_version = "2.1.0"
44

55
[workspace]
66
members = [

0 commit comments

Comments
 (0)