Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: is_dirty path bug on windows #783

Merged
merged 3 commits into from
Apr 6, 2023
+7 −6
Merged

fix: is_dirty path bug on windows #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bea02d
fix: is_dirty path bug on windows
oddgrd Apr 5, 2023
6811bb5
ci: go green
oddgrd Apr 5, 2023
b8002e0
ci: deployer go green
oddgrd Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cargo-shuttle/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
8 changes: 4 additions & 4 deletions deployer/src/deployment/deploy_layer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ mod tests {
);

select! {
_ = sleep(Duration::from_secs(360)) => {
_ = 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);
},
Expand Down Expand Up @@ -702,7 +702,7 @@ mod tests {
);

select! {
_ = sleep(Duration::from_secs(360)) => {
_ = 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);
}
Expand Down Expand Up @@ -749,7 +749,7 @@ mod tests {
);

select! {
_ = sleep(Duration::from_secs(360)) => {
_ = sleep(Duration::from_secs(460)) => {
let states = RECORDER.lock().unwrap().get_deployment_states(&id);
panic!("states should go into 'Crashed' panicking in bind: {:#?}", states);
}
Expand Down Expand Up @@ -792,7 +792,7 @@ mod tests {
);

select! {
_ = sleep(Duration::from_secs(360)) => {
_ = 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);
}
Expand Down