Merge branch 'main' into releases

Author: UebelAndre

crate_universe/tools/cross_installer/src/main.rs

@@ -86,7 +86,8 @@ fn main() {
     let workspace_root = PathBuf::from(
         env::var("BUILD_WORKSPACE_DIRECTORY")
             .expect("cross_installer is designed to run under Bazel"),
-    );
+    )
+    .join("crate_universe");
 
     // Do some setup
     prepare_workspace(&workspace_root);

crate_universe/tools/urls_generator/src/main.rs

@@ -73,8 +73,12 @@ fn locate_artifacts(artifacts_dir: &Path, url_prefix: &str) -> Vec<Artifact> {
                 .map(|f_entry| {
                     let f_path = f_entry.path();
                     let stem = f_path.file_stem().unwrap().to_string_lossy();
+                    let extension = f_path
+                        .extension()
+                        .map(|ext| format!(".{}", ext.to_string_lossy()))
+                        .unwrap_or_default();
                     Artifact {
-                        url: format!("{}/{}-{}", url_prefix, stem, triple),
+                        url: format!("{}/{}-{}{}", url_prefix, stem, triple, extension),
                         triple: triple.to_string(),
                         sha256: calculate_sha256(&f_entry.path()),
                     }