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

Add .gitattributes for fix Windows Line-ending problem in generated_grammar_is_fresh #1115

Merged
merged 1 commit into from
Apr 5, 2019

Conversation

edwin0cheng
Copy link
Member

@edwin0cheng edwin0cheng commented Apr 5, 2019

Although #937 is marked as Closed . But it should work without setting core.autocrlf to false by this PR.

.gitattributes Outdated Show resolved Hide resolved
@edwin0cheng edwin0cheng force-pushed the fix_windows_gen_test branch from 876e21c to 7ca0a10 Compare April 5, 2019 15:32
@matklad
Copy link
Member

matklad commented Apr 5, 2019

bors r+

Thanks!

bors bot added a commit that referenced this pull request Apr 5, 2019
1115: Add .gitattributes for fix Windows Line-ending problem in `generated_grammar_is_fresh` r=matklad a=edwin0cheng

Although #937 is marked as `Closed` . But it should work without setting `core.autocrlf` to `false` by this PR.

Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
@matklad
Copy link
Member

matklad commented Apr 5, 2019

Note that we explicitly don't test rust-analyzer on windows in hope that it is cross-platform by construction: #819

This might be a bad idea long term, but it might not!

@bors
Copy link
Contributor

bors bot commented Apr 5, 2019

Build succeeded

@bors bors bot merged commit 7ca0a10 into rust-lang:master Apr 5, 2019
@edwin0cheng
Copy link
Member Author

Personally i prefer travis build time to testing in Windows too. Just in case someone (like me) try to run cargo test and feel confused. 🤣

@edwin0cheng edwin0cheng deleted the fix_windows_gen_test branch April 5, 2019 17:30
@matklad
Copy link
Member

matklad commented Apr 5, 2019

The practical problem here is that downloading docs via rustup on windows takes more time than the whole Linux CI :-( And I think that bors time should be optimized as best as we can.

One though I've toyed with, but never implemented, is to switch to some kind of dockerized setup, where we use pre-installed stable rustup on CI. That might allow us to run both windows and linux builds (if there's some alternative to docker on windows) fast.

@bjorn3
Copy link
Member

bjorn3 commented Apr 5, 2019

if there's some alternative to docker on windows

Docker itself! https://docs.docker.com/docker-for-windows/

@matklad
Copy link
Member

matklad commented Apr 5, 2019

Also, if we move for cross-platform CI for this repo, we should probably investigate azure pipelines: having all platforms covered by the same provider is neat. I've set up azure for ra_vfs. It wasn't too pretty, but neither is travis or appveyor.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants