Fix settings path being incorrect when file is not under repo root #6707
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
lkillgore
approved these changes
Mar 15, 2018
jpricket
reviewed
Mar 15, 2018
| @@ -181,7 +181,7 @@ async function execBuild() { | |||
| if ((options[i] === '--settings' || options[i] === '-s') && (i + 1) < options.length) { | |||
| i++; // increment to the file name | |||
| let suppliedSettingsXml: string = options[i]; | |||
| tl.cp(path.join(tl.cwd(), suppliedSettingsXml), settingsXmlFile, ''); | |||
There was a problem hiding this comment.
Can you explain how resolve is better than join here? Is it because suppliedSettingsXml might be a full path?
There was a problem hiding this comment.
You can just use path.resolve(suppliedSettingsXml). resolve will prepend the current working directory to create an absolute path if suppliedSettingsXml is relative, or return suppliedSettingsXml if it is absolute.
There was a problem hiding this comment.
tl.cwd() is not necessarily the current working directory.
There was a problem hiding this comment.
@jpricketMSFT: Yes, join doesn't work if the suppliedSettingsXml is a full path that is not under the cwd (see linked issue)
@brcrista : I think the way it is written is more readable :)
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.
Fix for issue reported in the docs repo: https://github.com/MicrosoftDocs/vsts-docs/issues/212#issuecomment-373290579