Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli, client, lang: Bump solana toolchain to v1.7.1 #368

Merged
merged 2 commits into from
Jun 9, 2021
Merged

cli, client, lang: Bump solana toolchain to v1.7.1 #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cecb73a
cli, client, lang: Bump solana toolchain to v1.7.1
armaniferrante Jun 8, 2021
791d40a
Bump cli version in docker
armaniferrante Jun 8, 2021
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
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ cache: cargo
env:
global:
- NODE_VERSION="14.7.0"
- SOLANA_CLI_VERSION="1.7.1"
git:
submodules: true

Expand All @@ -27,9 +28,9 @@ _examples: &examples
- npm install -g @project-serum/common
- npm install -g @solana/spl-token
- sudo apt-get install -y pkg-config build-essential libudev-dev
- sh -c "$(curl -sSfL https://release.solana.com/v1.6.9/install)"
- sh -c "$(curl -sSfL https://release.solana.com/v${SOLANA_CLI_VERSION}/install)"
- export PATH="/home/travis/.local/share/solana/install/active_release/bin:$PATH"
- export NODE_PATH="/home/travis/.nvm/versions/node/v$NODE_VERSION/lib/node_modules/:$NODE_PATH"
- export NODE_PATH="/home/travis/.nvm/versions/node/v${NODE_VERSION}/lib/node_modules/:$NODE_PATH"
- yes | solana-keygen new
- cargo install --path $TRAVIS_BUILD_DIR/cli anchor-cli --locked

Expand Down
6 changes: 3 additions & 3 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ shellexpand = "2.1.0"
serde_yaml = "0.8"
toml = "0.5.8"
serde = { version = "1.0.122", features = ["derive"] }
solana-sdk = "1.6.6"
solana-program = "1.6.6"
solana-client = "1.6.6"
solana-sdk = "1.7.1"
solana-program = "1.7.1"
solana-client = "1.7.1"
serum-common = { git = "https://github.com/project-serum/serum-dex", features = ["client"] }
dirs = "3.0"
heck = "0.3.1"
Expand Down
4 changes: 2 additions & 2 deletions client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ anchor-lang = { path = "../lang", version = "0.7.0" }
anyhow = "1.0.32"
regex = "1.4.5"
serde = { version = "1.0.122", features = ["derive"] }
solana-client = "1.6.6"
solana-sdk = "1.6.6"
solana-client = "1.7.1"
solana-sdk = "1.7.1"
thiserror = "1.0.20"
2 changes: 1 addition & 1 deletion docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ANCHOR_CLI=v$(shell awk -F ' = ' '$$1 ~ /version/ { gsub(/[\"]/, "", $$2); print
#
# Solana toolchain.
#
SOLANA_CLI=v1.6.9
SOLANA_CLI=v1.7.1
#
# Build version should match the Anchor cli version.
#
Expand Down
2 changes: 1 addition & 1 deletion lang/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ anchor-derive-accounts = { path = "./derive/accounts", version = "0.7.0" }
base64 = "0.13.0"
borsh = "0.8.2"
bytemuck = "1.4.0"
solana-program = "1.6.6"
solana-program = "1.7.1"
thiserror = "1.0.20"