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

Jump to bottom

v2.0: Bump platform tools version to v1.42 (backport of #2355) #2461

Merged
merged 1 commit into from
Aug 8, 2024
Merged

v2.0: Bump platform tools version to v1.42 (backport of #2355) #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions sdk/cargo-build-sbf/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ fn find_installed_platform_tools() -> Vec<String> {
}

fn get_latest_platform_tools_version() -> Result<String, String> {
let url = "https://github.com/solana-labs/platform-tools/releases/latest";
let url = "https://github.com/anza-xyz/platform-tools/releases/latest";
let resp = reqwest::blocking::get(url).map_err(|err| format!("Failed to GET {url}: {err}"))?;
let path = std::path::Path::new(resp.url().path());
let version = path.file_name().unwrap().to_string_lossy().to_string();
Expand Down Expand Up @@ -618,7 +618,7 @@ fn build_solana_package(
install_if_missing(
config,
package,
"https://github.com/solana-labs/platform-tools/releases/download",
"https://github.com/anza-xyz/platform-tools/releases/download",
platform_tools_download_file_name.as_str(),
&target_path,
)
Expand Down Expand Up @@ -913,7 +913,7 @@ fn main() {

// The following line is scanned by CI configuration script to
// separate cargo caches according to the version of platform-tools.
let platform_tools_version = String::from("v1.41");
let platform_tools_version = String::from("v1.42");
let rust_base_version = get_base_rust_version(platform_tools_version.as_str());
let version = format!(
"{}\nplatform-tools {}\n{}",
Expand Down
2 changes: 1 addition & 1 deletion sdk/sbf/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
fi

# Install platform tools
version=v1.41
version=v1.42
if [[ ! -e platform-tools-$version.md || ! -e platform-tools ]]; then
(
set -e
Expand Down