Rebuild modulePath correctly in grunt _build:notice if on Windows #11439
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
|
Can one of the admins verify this patch? |
|
jenkins, test it |
epixa
changed the title
|
@LeeDr if you get a chance would you mind giving this a look too? |
|
I can update the PR this evening with that regex, if you fancy. Only take two mins and sits in this PR nicely. |
|
👍 works for me |
|
Alternation not alteration. 😠 |
LeeDr
approved these changes
May 9, 2017
There was a problem hiding this comment.
LGTM
I got past the _build:notice part on my Windows 10.
I'll file a new issue on this failure (I don't think it could be caused by this PR. I don't think I ever got this far on Windows before);
Running "_build:archives" task
> tar -zchf C:\git\kibana\target\kibana-6.0.0-alpha1-SNAPSHOT-darwin-x86_64.tar.gz kibana-6.0.0-alpha1-SNAPSHOT-darwin-x86_64
> tar -zchf C:\git\kibana\target\kibana-6.0.0-alpha1-SNAPSHOT-linux-x86_64.tar.gz kibana-6.0.0-alpha1-SNAPSHOT-linux-x86_64
> tar -zchf C:\git\kibana\target\kibana-6.0.0-alpha1-SNAPSHOT-linux-x86.tar.gz kibana-6.0.0-alpha1-SNAPSHOT-linux-x86
> zip -rq -ll C:\git\kibana\target\kibana-6.0.0-alpha1-SNAPSHOT-windows-x86.zip kibana-6.0.0-alpha1-SNAPSHOT-windows-x86
Warning: Command failed: tar -zchf C:\git\kibana\target\kibana-6.0.0-alpha1-SNAPSHOT-darwin-x86_64.tar.gz kibana-6.0.0-alpha1-SNAPSHOT-darwin-x86_64
tar (child): Cannot connect to C: resolve failed
Use --force to continue.
Aborted due to warnings.
|
@colmose thanks for the updates. If you get a chance can you rebase or merge master in? CI is failing on a sub node_module issue that we've fixed in master since. |
The module paths are split by ':' and with a Windows filepath (and the 'C:/' prefix), the split returns the drive letter and directory path separately. This causes the modulePath to be set incorrectly into the packagePaths object and the subsequent call for the licenses by key returns undefined on Windows only. This commit recombines the drive and directory paths and sets the correct key into packagePaths.
|
Done, was just waiting for a thumbs up before tidying up after myself! 👍 |
|
@LeeDr, I'm not on a windows box for a few days, can you test this branch of my fork? That might sort the tar issue (based on this) |
|
jenkins, test it |
|
LGTM. Thank you for the PR and quick responses @colmose. |
jbudz
pushed a commit
to jbudz/kibana
that referenced
this pull request
May 10, 2017
The module paths are split by ':' and with a Windows filepath (and the 'C:/' prefix), the split returns the drive letter and directory path separately. This causes the modulePath to be set incorrectly into the packagePaths object and the subsequent call for the licenses by key returns undefined on Windows only. This commit recombines the drive and directory paths and sets the correct key into packagePaths.
|
No problem, I'll have a look at that tar issue when I get onto a windows box. |
jbudz
added a commit
that referenced
this pull request
May 10, 2017
The module paths are split by ':' and with a Windows filepath (and the 'C:/' prefix), the split returns the drive letter and directory path separately. This causes the modulePath to be set incorrectly into the packagePaths object and the subsequent call for the licenses by key returns undefined on Windows only. This commit recombines the drive and directory paths and sets the correct key into packagePaths.
snide
pushed a commit
to snide/kibana
that referenced
this pull request
May 30, 2017
The module paths are split by ':' and with a Windows filepath (and the 'C:/' prefix), the split returns the drive letter and directory path separately. This causes the modulePath to be set incorrectly into the packagePaths object and the subsequent call for the licenses by key returns undefined on Windows only. This commit recombines the drive and directory paths and sets the correct key into packagePaths.
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.
The module paths are split by ':' and with a Windows filepath (and the 'C:/' prefix), the split returns the drive letter and directory path separately. This causes the modulePath to be set incorrectly into the packagePaths object and the subsequent call for the licenses by key returns undefined on Windows only.
This branch recombines the drive and directory paths and sets the correct key into packagePaths.
Fixes #11408