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 lint-staged for both win and mac #7784

Merged
merged 1 commit into from Jan 29, 2020

Conversation

telamonian
Copy link
Member

@telamonian telamonian commented Jan 15, 2020

References

0bdce26
#7708
okonet/lint-staged#676 (comment)
https://github.com/zeit/next.js/blob/canary/lint-staged.config.js

Code changes

Changed the lint-staged config from a json file to a js script. This is to fix an ongoing back and forth in which said config is broken w.r.t. to exactly one of mac and windows.

@vidartf I've tested this PR on mac. Can you please test this out for me on Windows?

User-facing changes

NA

Backwards-incompatible changes

NA

@jupyterlab-dev-mode
Copy link

@jupyterlab-dev-mode jupyterlab-dev-mode bot commented Jan 15, 2020

Thanks for making a pull request to JupyterLab!

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

@afshin
Copy link
Member

@afshin afshin commented Jan 19, 2020

I don't understand this Windows failure. It seems to fail repeatedly on the git checkout.

Any idea what is happening? Perhaps if you rebase and it is pulling something different it might get past that?

@telamonian
Copy link
Member Author

@telamonian telamonian commented Jan 21, 2020

Perhaps if you rebase and it is pulling something different it might get past that?

Rebase done (feels a bit like fiddling with the antenna on a tv). We'll see if that resolves the weird checkout problem

@vidartf
Copy link
Member

@vidartf vidartf commented Jan 29, 2020

Seems to work locally. Thanks!

@vidartf vidartf merged commit c443c24 into jupyterlab:master Jan 29, 2020
10 checks passed
@jasongrout jasongrout added this to the 2.0 milestone Feb 24, 2020
@lock lock bot added the status:resolved-locked label Mar 27, 2020
@lock lock bot locked as resolved and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:resolved-locked
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants