From 5bea02dc6e9bddb396508b094a95b8effc277054 Mon Sep 17 00:00:00 2001
From: oddgrd <29732646+oddgrd@users.noreply.github.com>
Date: Wed, 5 Apr 2023 11:52:40 +0200
Subject: [PATCH 1/3] fix: is_dirty path bug on windows

---
 cargo-shuttle/src/lib.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs
index 2772ea22f..74c05bc2c 100644
--- a/cargo-shuttle/src/lib.rs
+++ b/cargo-shuttle/src/lib.rs
@@ -885,8 +885,9 @@ impl Shuttle {
         if let Ok(repo) = Repository::discover(working_directory) {
             let repo_path = repo
                 .workdir()
-                .context("getting working directory of repository")?
-                .canonicalize()?;
+                .context("getting working directory of repository")?;
+
+            let repo_path = dunce::canonicalize(repo_path)?;
 
             trace!(?repo_path, "found git repository");
 

From 6811bb5df34ce78a6a2ebf3f5552ce85cf492649 Mon Sep 17 00:00:00 2001
From: oddgrd <29732646+oddgrd@users.noreply.github.com>
Date: Wed, 5 Apr 2023 13:01:22 +0200
Subject: [PATCH 2/3] ci: go green

---
 deployer/src/deployment/deploy_layer.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployer/src/deployment/deploy_layer.rs b/deployer/src/deployment/deploy_layer.rs
index f38823a13..79a3efc7c 100644
--- a/deployer/src/deployment/deploy_layer.rs
+++ b/deployer/src/deployment/deploy_layer.rs
@@ -618,7 +618,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(360)) => {
+            _ = sleep(Duration::from_secs(400)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Running' for a valid service: {:#?}", states);
             },
@@ -702,7 +702,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(360)) => {
+            _ = sleep(Duration::from_secs(400)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Completed' when a service stops by itself: {:#?}", states);
             }
@@ -749,7 +749,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(360)) => {
+            _ = sleep(Duration::from_secs(400)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Crashed' panicking in bind: {:#?}", states);
             }
@@ -792,7 +792,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(360)) => {
+            _ = sleep(Duration::from_secs(400)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Crashed' when panicking in main: {:#?}", states);
             }

From b8002e0717a6e4a726f3804403fdc8775e1f11f1 Mon Sep 17 00:00:00 2001
From: oddgrd <29732646+oddgrd@users.noreply.github.com>
Date: Wed, 5 Apr 2023 13:22:03 +0200
Subject: [PATCH 3/3] ci: deployer go green

---
 deployer/src/deployment/deploy_layer.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployer/src/deployment/deploy_layer.rs b/deployer/src/deployment/deploy_layer.rs
index 79a3efc7c..8af5c231c 100644
--- a/deployer/src/deployment/deploy_layer.rs
+++ b/deployer/src/deployment/deploy_layer.rs
@@ -618,7 +618,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(400)) => {
+            _ = sleep(Duration::from_secs(460)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Running' for a valid service: {:#?}", states);
             },
@@ -702,7 +702,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(400)) => {
+            _ = sleep(Duration::from_secs(460)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Completed' when a service stops by itself: {:#?}", states);
             }
@@ -749,7 +749,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(400)) => {
+            _ = sleep(Duration::from_secs(460)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Crashed' panicking in bind: {:#?}", states);
             }
@@ -792,7 +792,7 @@ mod tests {
         );
 
         select! {
-            _ = sleep(Duration::from_secs(400)) => {
+            _ = sleep(Duration::from_secs(460)) => {
                 let states = RECORDER.lock().unwrap().get_deployment_states(&id);
                 panic!("states should go into 'Crashed' when panicking in main: {:#?}", states);
             }