Merge pull request #496 from epage/config

fix(config): Load workspace config from workspace
crate-ci · Jul 12, 2022 · 14293c3 · 14293c3
2 parents d1e02bb + 074efae
commit 14293c3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -623,12 +623,13 @@ pub fn resolve_config(workspace_root: &Path, manifest_path: &Path) -> Result<Con
         if let Some(cfg) = current_dir_config {
             config.update(&cfg);
         };
-    }
 
-    let current_dir_config = get_ws_config_from_manifest(manifest_path)?;
-    if let Some(cfg) = current_dir_config {
-        config.update(&cfg);
-    };
+        let root_manifest_path = workspace_root.join("Cargo.toml");
+        let current_dir_config = get_ws_config_from_manifest(&root_manifest_path)?;
+        if let Some(cfg) = current_dir_config {
+            config.update(&cfg);
+        };
+    }
 
     // Crate config
     let default_config = crate_root.join("release.toml");