Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add commit_id option to ServeWebArgs for specific client version (#255494)

Browse Source 
* Add commit_id option to ServeWebArgs for specific client version

* Don't start serve-web update checker if given commit-id
This commit is contained in:
Justin Wang
2025-07-14 02:12:36 -04:00
committed by GitHub
parent cd20192782
commit b4d1fec915
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cli/src/commands/args.rs
View File

@@ -216,6 +216,9 @@ pub struct ServeWebArgs {
/// Specifies the directory that server data is kept in. /// Specifies the directory that server data is kept in.
#[clap(long)] #[clap(long)]
pub server_data_dir: Option<String>, pub server_data_dir: Option<String>,
/// Use a specific commit SHA for the client.
#[clap(long)]
pub commit_id: Option<String>,
} }
#[derive(Args, Debug, Clone)] #[derive(Args, Debug, Clone)]

18
cli/src/commands/serve_web.rs
View File

@@ -88,8 +88,10 @@ pub async fn serve_web(ctx: CommandContext, mut args: ServeWebArgs) -> Result<i3
let cm: Arc<ConnectionManager> = ConnectionManager::new(&ctx, platform, args.clone()); let cm: Arc<ConnectionManager> = ConnectionManager::new(&ctx, platform, args.clone());
let update_check_interval = 3600; let update_check_interval = 3600;
if args.commit_id.is_none() {
cm.clone() cm.clone()
.start_update_checker(Duration::from_secs(update_check_interval)); .start_update_checker(Duration::from_secs(update_check_interval));
}
let key = get_server_key_half(&ctx.paths); let key = get_server_key_half(&ctx.paths);
let make_svc = move || { let make_svc = move || {
@@ -629,6 +631,22 @@ impl ConnectionManager {
Quality::try_from(q).map_err(|_| CodeError::UpdatesNotConfigured("unknown quality")) Quality::try_from(q).map_err(|_| CodeError::UpdatesNotConfigured("unknown quality"))
})?; })?;
if let Some(commit) = &self.args.commit_id {
let release = Release {
name: commit.to_string(),
commit: commit.to_string(),
platform: self.platform,
target: target_kind,
quality,
};
debug!(
self.log,
"using provided commit instead of latest release: {}", release
);
*latest = Some((now, release.clone()));
return Ok(release);
}
let release = self let release = self
.update_service .update_service
.get_latest_commit(self.platform, target_kind, quality) .get_latest_commit(self.platform, target_kind, quality)