Do not canonicalize a target dir if it does not exist yet.

Concordium · Oct 27, 2023 · b766888 · b766888
1 parent 3634014
commit b766888
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/cargo-concordium/Cargo.lock b/cargo-concordium/Cargo.lock
diff --git a/cargo-concordium/Cargo.toml b/cargo-concordium/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-concordium"
-version = "3.1.2"
+version = "3.1.3"
 authors = ["Concordium <[email protected]>"]
 edition = "2021"
 license-file = "../LICENSE"

diff --git a/cargo-concordium/README.md b/cargo-concordium/README.md
@@ -93,6 +93,7 @@ of the package root subject to the following
 - the package build directory (typically `target`) will be ignored
 - additional files listed in any `.ignore` files will be ignored. The format
   of this file should be the same as a `.gitignore` file.
+- hidden files are ignored.
 
 Information about the sources and the build will be embedded into
 `contract.wasm.v1` file. This information includes

diff --git a/cargo-concordium/src/build.rs b/cargo-concordium/src/build.rs
@@ -152,7 +152,7 @@ fn create_archive(
         .git_global(true)
         .git_ignore(true)
         .parents(true)
-        .hidden(false)
+        .hidden(true)
         .sort_by_file_path(std::cmp::Ord::cmp)
         .build();
     let mut lock_file_found = false;
@@ -488,18 +488,21 @@ pub fn build_contract(
             tar_filename.push(".tar");
             tar_filename.into()
         };
+        let mut package_target_dir = metadata.target_directory.as_std_path().to_path_buf();
+        if package_target_dir
+            .try_exists()
+            .context("Unable to check if target directory exists.")?
+        {
+            package_target_dir = package_target_dir.canonicalize()?;
+        };
         let ContainerBuildOutput {
             output_wasm,
             build_info,
             tar_archive,
         } = build_in_container(
             image,
             PackageData {
-                package_target_dir:     metadata
-                    .target_directory
-                    .as_std_path()
-                    .canonicalize()?
-                    .as_path(),
+                package_target_dir:     package_target_dir.as_path(),
                 package_root_path:      package_root_path.as_path(),
                 package_version_string: &package_version_string,
             },

diff --git a/cargo-concordium/src/main.rs b/cargo-concordium/src/main.rs
@@ -613,7 +613,7 @@ const WARNING_STYLE: ansi_term::Color = ansi_term::Color::Yellow;
 pub fn main() -> anyhow::Result<()> {
     #[cfg(target_os = "windows")]
     {
-        ansi_term::enable_ansi_support();
+        let _ = ansi_term::enable_ansi_support();
     }
     let cmd = {
         let app = CargoCommand::clap()