From 074efaec65ed0ab2f3fd87c4cdd39d3d02c6330b Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Mon, 11 Jul 2022 21:34:58 -0500
Subject: [PATCH] fix(config): Load workspace config from workspace

Before, we were loading it from the current manifest path.

Fixes #495
---
 src/config.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 04230a4a4..8c3138b35 100644
--- 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");