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

add support for downloading specific version of toolchain #57

Merged
merged 3 commits into from
Sep 2, 2024
Merged

add support for downloading specific version of toolchain #57

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c85537d
add support for downloading specific version of toolchain
maminrayej Sep 1, 2024
c679703
resolve comments
maminrayej Sep 2, 2024
16b0a4b
fix fmt
maminrayej Sep 2, 2024
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
11 changes: 9 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ fn rmain(config: &mut Config) -> Result<()> {
if !no_message_format {
cargo.arg("--message-format").arg("json-render-diagnostics");
}
for arg in args {

let args = args.collect::<Vec<_>>();
Arshia001 marked this conversation as resolved.
Show resolved Hide resolved
for arg in args.clone() {
if let Some(arg) = arg.to_str() {
if arg.starts_with("--verbose") || arg.starts_with("-v") {
config.set_verbose(true);
Expand Down Expand Up @@ -178,8 +180,13 @@ fn rmain(config: &mut Config) -> Result<()> {
let mut check_deps = false;
match subcommand {
Subcommand::DownloadToolchain => {
let version = args
.first()
.cloned()
.map(|v| v.into_string().unwrap())
.unwrap_or("latest".to_owned());
maminrayej marked this conversation as resolved.
Show resolved Hide resolved
let _lock = Config::acquire_lock()?;
let chain = toolchain::install_prebuilt_toolchain(&Config::toolchain_dir()?)?;
let chain = toolchain::install_prebuilt_toolchain(&Config::toolchain_dir()?, version)?;
config.info(&format!(
"Toolchain {} downloaded and installed to path {}.\nThe wasix toolchain is now ready to use.",
chain.name,
Expand Down
29 changes: 22 additions & 7 deletions src/toolchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,11 @@ struct GithubAsset {
}

/// Download a pre-built toolchain from Github releases.
fn download_toolchain(target: &str, toolchains_root_dir: &Path) -> Result<PathBuf, anyhow::Error> {
fn download_toolchain(
target: &str,
toolchains_root_dir: &Path,
version: String,
) -> Result<PathBuf, anyhow::Error> {
let mut headers = HeaderMap::new();

// Use api token if specified via env var.
Expand All @@ -553,9 +557,16 @@ fn download_toolchain(target: &str, toolchains_root_dir: &Path) -> Result<PathBu
let repo = RUST_REPO
.trim_start_matches("https://github.com/")
.trim_end_matches(".git");
let release_url = format!("https://api.github.com/repos/{repo}/releases/latest");

eprintln!("Finding latest release... ({release_url})...");
let postfix = if version == "latest" {
version.clone()
} else {
format!("tags/{version}")
};

let release_url = format!("https://api.github.com/repos/{repo}/releases/{postfix}");

eprintln!("Finding {version} release... ({release_url})...");

let release: GithubReleaseData = client
.get(&release_url)
Expand Down Expand Up @@ -672,9 +683,12 @@ fn download_toolchain(target: &str, toolchains_root_dir: &Path) -> Result<PathBu
/// toolchain locally otherwise.
///
/// Returns the path to the toolchain.
pub fn install_prebuilt_toolchain(toolchain_dir: &Path) -> Result<RustupToolchain, anyhow::Error> {
pub fn install_prebuilt_toolchain(
toolchain_dir: &Path,
version: String,
) -> Result<RustupToolchain, anyhow::Error> {
if let Some(target) = guess_host_target() {
match download_toolchain(target, toolchain_dir) {
match download_toolchain(target, toolchain_dir, version) {
Ok(path) => RustupToolchain::link(RUSTUP_TOOLCHAIN_NAME, &path.join("rust")),
Err(err) => {
eprintln!("Could not download pre-built toolchain: {err:?}");
Expand Down Expand Up @@ -804,7 +818,7 @@ pub fn ensure_toolchain(config: &Config, is64bit: bool) -> Result<RustupToolchai
let toolchain = if let Some(chain) = RustupToolchain::find_by_name(RUSTUP_TOOLCHAIN_NAME)? {
chain
} else if !config.is_offline {
install_prebuilt_toolchain(&Config::toolchain_dir()?)?
install_prebuilt_toolchain(&Config::toolchain_dir()?, "latest".to_owned())?
} else {
bail!(
r#"
Expand Down Expand Up @@ -856,7 +870,8 @@ mod tests {
if tmp_dir.is_dir() {
std::fs::remove_dir_all(&tmp_dir).unwrap_or_default();
}
let root = download_toolchain("x86_64-unknown-linux-gnu", &tmp_dir).unwrap();
let root =
download_toolchain("x86_64-unknown-linux-gnu", &tmp_dir, "latest".to_owned()).unwrap();
let dir = root.join("rust");

#[cfg(not(target_os = "windows"))]
Expand Down
Loading