-
Notifications
You must be signed in to change notification settings - Fork 1.4k
fix reinstall native dependency #18582
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.
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
Merged
Praveen Kuttappan (praveenkuttappan)
merged 11 commits into
Azure:main
from
praveenkuttappan:keytar_debug
Nov 9, 2021
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
7988bf4
DEbug keytar install
praveenkuttappan c67c05f
DEbug keytar install
praveenkuttappan e1b561c
DEbug keytar install
praveenkuttappan 3093d46
More debugging
praveenkuttappan 3d02807
More debugging with possible solution
praveenkuttappan cea3550
Generate absolute path for symlink to reinstall native dependency
praveenkuttappan 87be2ae
Additional fix
praveenkuttappan cfa3410
Additional fix
praveenkuttappan 4e8fcd2
Add step condition and remvoe empty line
praveenkuttappan b07de39
Changes as per review comments
praveenkuttappan 41d05b1
More review changes
praveenkuttappan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,9 @@ steps: | |
| } | ||
| # Map from the symlink path to the target path (npm has issues installing into symlink dirs) | ||
| # Example: common/temp/node_modules/.pnpm/keytar@5.6.0/node_modules/keytar | ||
| $targetPath = (Get-Item $symlink).Target | ||
| $symlinkInfo = Get-Item $symlink | ||
| $targetPath = [IO.Path]::Combine($symlinkInfo.Parent, $symlinkInfo.Target) | ||
| Write-Host "Target of symlink : $($targetPath)" | ||
|
|
||
| # Need to run "npm install" at path containing "node_modules" folder | ||
| # Example: common/temp/node_modules/.pnpm/keytar@5.6.0 | ||
|
|
@@ -38,11 +40,9 @@ steps: | |
| } | ||
|
|
||
| $packageAtVersion = Split-Path -Leaf $packageInstallPath | ||
|
|
||
| # pnpm v6 replaces '/' in package names with '+' to reduce nesting directory in virtual store so we need to | ||
| # change it back | ||
| $packageAtVersion = $packageAtVersion.Replace("+", "/") | ||
|
|
||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I have reverted this new line change and it's showing up correctly on view file of latest commit. |
||
| # Check if package has org name. for e.g @azure/msal-node-enxtensions | ||
| # This returns either @azure or .pnpm( if no org is present) | ||
| $packageParentName = Split-path -Leaf (Split-Path -Parent -Resolve $packageInstallPath) | ||
|
|
@@ -62,4 +62,4 @@ steps: | |
| } | ||
|
|
||
| displayName: Reinstall native dependencies | ||
| condition: ne(variables['NodeTestVersion'], variables['NodeVersion']) | ||
|
praveenkuttappan marked this conversation as resolved.
|
||
| condition: and(succeeded(),ne(variables['NodeTestVersion'], variables['NodeVersion'])) | ||
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.
Uh oh!
There was an error while loading. Please reload this page.