Fix locating kudusync.cmd in Fake.Azure.Kudu #1995
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nikolaia
changed the title
|
Can you please merge release/next to get the CI green? |
matthid
reviewed
Jun 13, 2018
src/app/Fake.Azure.Kudu/Kudu.fs
Outdated
| @@ -17,7 +17,7 @@ let nextManifestPath = Environment.environVarOrDefault "NEXT_MANIFEST_PATH" Stri | |||
| /// Used by KuduSync for tracking and diffing deployments. | |||
| let previousManifestPath = Environment.environVarOrDefault "PREVIOUS_MANIFEST_PATH" String.Empty | |||
| /// The path to the KuduSync application. | |||
| let kuduPath = (Environment.environVarOrDefault "GO_WEB_CONFIG_TEMPLATE" ".") |> DirectoryInfo.ofPath | |||
| let kuduPath = (Environment.environVarOrDefault "GO_WEB_CONFIG_TEMPLATE" ".") |> Path.GetDirectoryName | |||
There was a problem hiding this comment.
But this is incorrect if we fallback to the default of ., correct?
There was a problem hiding this comment.
Same script as above in the PR with "."
Starting target 'Old'
NoDescription
"D:\home\kudusync.cmd"
Finished (Success) 'Old' in 00:00:00.1062350
Starting target 'New'
NoDescription
"kudusync.cmd"
Finished (Success) 'New' in 00:00:00.0003611
There is no kudusync.cmd in D:\home, but there is an kudusync.cmd in the PATH variable 🤔 Old fallback doesn't make to much sense to me, but I can fix it to return the same (since some people may be dependent on it, and I don't wanna break it)
src/app/Fake.Azure.Kudu/Kudu.fs
Outdated
| FileName = Path.Combine(kuduPath.FullName, "kudusync.cmd") | ||
| Arguments = sprintf """-v 50 -f "%s" -t "%s" -n "%s" -p "%s" -i ".git;.hg;.deployment;deploy.cmd""" deploymentTemp deploymentTarget nextManifestPath previousManifestPath }) | ||
| FileName = Path.Combine(kuduPath, "kudusync.cmd") | ||
| Arguments = sprintf """-v 50 -f "%s" -t "%s" -n "%s" -p "%s" -i ".git;.hg;.deployment;deploy.cmd" """ deploymentTemp deploymentTarget nextManifestPath previousManifestPath }) |
There was a problem hiding this comment.
Another way would be to build an array and use Args.toWindowsCommandLine to properly handle all the escaping ugliness of windows
There was a problem hiding this comment.
Done. Works great:
2018-06-14T12:48:17.8474026Z : D:\Program Files (x86)\SiteExtensions\Kudu\74.10611.3437\bin\Scripts\kudusync.cmd "-v" "50" "-f" "D:\local\Temp\8d5d1f4f73e61d1" "-t" "D:\home\site\wwwroot" "-n" "D:\home\site\deployments\1ad4a3db64f24589945de5ab0db7cd6a\manifest" "-p" "D:\home\site\deployments\f54a08fb6cce467cb1e8427e9c6a6337\manifest" "-i" ".git;.hg;.deployment;deploy.cmd"
|
Thanks for taking care of this! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Seems to me the current implementation resolves the wrong path. The following script and output is from inside the Kudu-sandbox: