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.

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 build util paths for Windows #7019

Merged
merged 1 commit into from Aug 15, 2019

Conversation

vidartf
Copy link
Member

@vidartf vidartf commented Aug 15, 2019

References

Fixes build utils for Windows after #6034.

Also ensures that file contents line endings are normalized, to prevent line-ending only diffs.

Code changes

Replaces path sep with '/' to normalize slashes.

Replaces '\n' with the current line ending of the file in ensureFile.

User-facing changes

None

Backwards-incompatible changes

None

@jupyterlab-dev-mode
Copy link

Thanks for making a pull request to JupyterLab!

To try out this branch on binder, follow this link: Binder

Copy link
Member

@blink1073 blink1073 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@blink1073 blink1073 merged commit bef72f1 into jupyterlab:master Aug 15, 2019
@vidartf vidartf deleted the buildutils-windows branch August 16, 2019 08:23
@jasongrout
Copy link
Contributor

Should we backport this?

@blink1073
Copy link
Member

Sure, why not.

@blink1073
Copy link
Member

@meeseeksdev backport to 1.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 16, 2019

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 bef72f15217d9a5fff7a47f2a690fe13e1309da2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #7019: Fix build util paths for Windows'
  1. Push to a named branch :
git push YOURFORK 1.0.x:auto-backport-of-pr-7019-on-1.0.x
  1. Create a PR against branch 1.0.x, I would have named this PR:

"Backport PR #7019 on branch 1.0.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@blink1073
Copy link
Member

nvm, not worth doing manually

@blink1073 blink1073 added this to the 1.1 milestone Aug 22, 2019
@vidartf
Copy link
Member Author

vidartf commented Aug 28, 2019

Cleaned up the label.

@lock lock bot added the status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. label Sep 27, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Sep 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants