Skip to content

Commit

Permalink
deps: Upgrade to Solana v2 (#6908)
Browse files Browse the repository at this point in the history
* solana: Update deps to 2.0.0

* Update lockfile

* Update toolchain version

* Update nightly version

* Fix check issues

* Fix clippy

* Revert upgrade for account compression libs

* Install build deps for serde test

* Fixup versions

* Fixup twoxtx build

* Revert solana install version

* Actually, get version 2.0.0 from the correct place
  • Loading branch information
joncinque committed Jun 25, 2024
1 parent d85ea9f commit af8e295
Show file tree
Hide file tree
Showing 95 changed files with 1,179 additions and 1,189 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/pull-request-token.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ jobs:
~/.cargo/git
key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}}

- name: Install dependencies
run: |
./ci/install-build-deps.sh
- name: Test token-2022 with "serde" activated
run: |
cargo test \
Expand Down Expand Up @@ -215,7 +219,7 @@ jobs:

- name: Set env vars
run: |
echo "RUST_STABLE_VERSION=1.72.0" >> $GITHUB_ENV
echo "RUST_STABLE_VERSION=1.78.0" >> $GITHUB_ENV
source ci/rust-version.sh
echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV
source ci/solana-version.sh
Expand Down
2 changes: 1 addition & 1 deletion Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
anchor_version = "0.29.0"
solana_version = "1.18.11"
solana_version = "2.0.0"

[workspace]
members = [
Expand Down
Loading

0 comments on commit af8e295

Please sign in to comment.