language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-09-26 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix(upgrade): skip version comparison when upgrading (#29112)

Browse source
This commit is contained in:
David Sherret 2025-05-13 14:58:57 -04:00 • committed by GitHub
parent 5ea90de199
commit b384bd3433
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

44
cli/tools/upgrade.rs
View file

@ -754,46 +754,22 @@ async fn find_latest_version_to_upgrade(
}
};
let (maybe_newer_latest_version, current_version) = match release_channel {
ReleaseChannel::Canary => {
let current_version = version::DENO_VERSION_INFO.git_hash;
let current_is_most_recent =
current_version == latest_version_found.version_or_hash;
if !force && current_is_most_recent {
(None, current_version)
} else {
(Some(latest_version_found), current_version)
}
}
let current_version = match release_channel {
ReleaseChannel::Canary => version::DENO_VERSION_INFO.git_hash,
ReleaseChannel::Stable | ReleaseChannel::Lts | ReleaseChannel::Rc => {
let current_version = version::DENO_VERSION_INFO.deno;
// If the current binary is not the same channel, we can skip
// computation if we're on a newer release - we're not.
if version::DENO_VERSION_INFO.release_channel != release_channel {
(Some(latest_version_found), current_version)
} else {
let current = Version::parse_standard(current_version)?;
let latest =
Version::parse_standard(&latest_version_found.version_or_hash)?;
let current_is_most_recent = current >= latest;
if !force && current_is_most_recent {
(None, current_version)
} else {
(Some(latest_version_found), current_version)
}
}
version::DENO_VERSION_INFO.deno
}
};
let should_upgrade = force
|| current_version != latest_version_found.version_or_hash
|| version::DENO_VERSION_INFO.release_channel != release_channel;
log::info!("");
if let Some(newer_latest_version) = maybe_newer_latest_version.as_ref() {
if should_upgrade {
log::info!(
"Found latest {} version {}",
newer_latest_version.release_channel.name(),
color_print::cformat!("<g>{}</>", newer_latest_version.display())
latest_version_found.release_channel.name(),
color_print::cformat!("<g>{}</>", latest_version_found.display())
);
} else {
log::info!(
@ -803,7 +779,7 @@ async fn find_latest_version_to_upgrade(
}
log::info!("");
Ok(maybe_newer_latest_version)
Ok(should_upgrade.then_some(latest_version_found))
}
#[derive(Debug, Clone, PartialEq)]