Skip to content
Merged

Minor #5523

Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 17 additions & 10 deletions xtask/src/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,24 @@ use crate::{
project_root,
};

pub fn run_dist(nightly: bool, client_version: Option<String>) -> Result<()> {
let dist = project_root().join("dist");
rm_rf(&dist)?;
fs2::create_dir_all(&dist)?;

if let Some(version) = client_version {
let release_tag = if nightly { "nightly".to_string() } else { date_iso()? };
dist_client(&version, &release_tag)?;
pub struct DistCmd {
pub nightly: bool,
pub client_version: Option<String>,
}

impl DistCmd {
pub fn run(self) -> Result<()> {
let dist = project_root().join("dist");
rm_rf(&dist)?;
fs2::create_dir_all(&dist)?;

if let Some(version) = self.client_version {
let release_tag = if self.nightly { "nightly".to_string() } else { date_iso()? };
dist_client(&version, &release_tag)?;
}
dist_server()?;
Ok(())
}
dist_server()?;
Ok(())
}

fn dist_client(version: &str, release_tag: &str) -> Result<()> {
Expand Down
7 changes: 4 additions & 3 deletions xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use std::env;
use pico_args::Arguments;
use xtask::{
codegen::{self, Mode},
dist::run_dist,
dist::DistCmd,
install::{ClientOpt, InstallCmd, Malloc, ServerOpt},
not_bash::pushd,
pre_commit, project_root,
Expand Down Expand Up @@ -115,7 +115,7 @@ FLAGS:
let nightly = args.contains("--nightly");
let client_version: Option<String> = args.opt_value_from_str("--client")?;
args.finish()?;
run_dist(nightly, client_version)
DistCmd { nightly, client_version }.run()
}
_ => {
eprintln!(
Expand All @@ -133,7 +133,8 @@ SUBCOMMANDS:
codegen
install
lint
dist"
dist
promote"
);
Ok(())
}
Expand Down