Merge branch 'wip/mwu/cloud-fixes' of https://github.com/enso-org/enso …

…into wip/mwu/cloud-fixes

build/build/paths.yaml

@@ -49,7 +49,7 @@
         shaders/:    # Optimized shaders that contain main function code only.
         pkg.js:      # The `pks.js` artifact of wasm-pack WITH bundled snippets.
         pkg.js.map:  # The sourcemap mapping to `pkg.js` generated by wasm-pack.
-        pkg.wasm:    # The `pks_bg.wasm` artifact of wasm-pack.
+        pkg-opt.wasm:    # The optimized WASM artifact.
         index.js:
         style.css:
 

build/build/src/aws/s3.rs

@@ -91,6 +91,7 @@ impl BucketContext {
 
     /// Put the file at `path` to the S3 bucket. The key will be suffixed with the relative path
     /// between `root` and `path`.
+    #[instrument(fields(path = %path.as_ref().display(), root = %root.as_ref().display()))]
     pub async fn put_subtree_file(
         &self,
         root: impl AsRef<Path>,

build/build/src/release.rs

@@ -281,7 +281,7 @@ pub async fn upload_gui_to_cloud(
 
     // Some file we upload as-is, some gzipped. This seems somewhat arbitrary now.
     let files_to_upload =
-        [assets.pkg_wasm.as_path(), assets.style_css.as_path(), assets.shaders.as_path()];
+        [assets.pkg_opt_wasm.as_path(), assets.style_css.as_path(), assets.shaders.as_path()];
     let files_to_upload_gzipped = [assets.index_js.as_path(), assets.pkg_js.as_path()];
 
     for file in files_to_upload.iter() {
@@ -360,7 +360,7 @@ mod tests {
         let assets = crate::paths::generated::RepoRootDistGuiAssets::new_root(
             r"H:\NBO\enso4\dist\gui\assets",
         );
-        let version = "2022.1.1-dev.provisional.test.2".parse2()?;
+        let version = "2023.1.1-dev.cloud.test".parse2()?;
         upload_gui_to_cloud(&assets, &version).await?;
         notify_cloud_about_gui(&version).await?;
         Ok(())