Merge #11727 #11728

11727: minor: Fix metrics.json path r=jonas-schievink a=lnicola

CC #11724 (comment)

11728: Try to fix nightlies r=jonas-schievink a=jonas-schievink

bors r+

Co-authored-by: Laurențiu Nicola <[email protected]>
Co-authored-by: Jonas Schievink <[email protected]>

Author: 3 people

xtask/src/dist.rs

@@ -17,7 +17,7 @@ impl flags::Dist {
         let project_root = project_root();
         let target = Target::get(&project_root);
         let dist = project_root.join("dist");
-        sh.remove_path(&dist)?;
+        let _ = sh.remove_path(&dist);
         sh.create_dir(&dist)?;
 
         let release_channel = if stable { "stable" } else { "nightly" };

xtask/src/metrics.rs

@@ -51,10 +51,13 @@ impl flags::Metrics {
                 "git clone --depth 1 https://{metrics_token}@github.com/rust-analyzer/metrics.git"
             )
             .run()?;
-            let _d = sh.push_dir("metrics");
 
-            let mut file = fs::File::options().append(true).open("metrics.json")?;
-            writeln!(file, "{}", metrics.json())?;
+            {
+                let mut file = fs::File::options().append(true).open("metrics/metrics.json")?;
+                writeln!(file, "{}", metrics.json())?;
+            }
+
+            let _d = sh.push_dir("metrics");
             cmd!(sh, "git add .").run()?;
             cmd!(sh, "git -c user.name=Bot -c [email protected] commit --message 📈")
                 .run()?;