Merge #8666

8666: fix: correct version string on windows and mac r=matklad a=matklad



Co-authored-by: Aleksey Kladov <[email protected]>

1 files changed, 2 insertions, 6 deletions

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 960927fc0..01bf6e70d 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -28,8 +28,6 @@ use std::{
 use walkdir::{DirEntry, WalkDir};
 use xshell::{cmd, cp, pushd, pushenv};
 
-use crate::dist::DistCmd;
-
 fn main() -> Result<()> {
     let _d = pushd(project_root())?;
 
@@ -44,9 +42,7 @@ fn main() -> Result<()> {
         flags::XtaskCmd::PreCache(cmd) => cmd.run(),
         flags::XtaskCmd::Release(cmd) => cmd.run(),
         flags::XtaskCmd::Promote(cmd) => cmd.run(),
-        flags::XtaskCmd::Dist(flags) => {
-            DistCmd { nightly: flags.nightly, client_version: flags.client }.run()
-        }
+        flags::XtaskCmd::Dist(cmd) => cmd.run(),
         flags::XtaskCmd::Metrics(cmd) => cmd.run(),
         flags::XtaskCmd::Bb(cmd) => {
             {
@@ -112,7 +108,7 @@ fn run_fuzzer() -> Result<()> {
 }
 
 fn date_iso() -> Result<String> {
-    let res = cmd!("date --iso --utc").read()?;
+    let res = cmd!("date --utc +%Y-%m-%d").read()?;
     Ok(res)
 }