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.

Sign up for GitHub

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

Jump to bottom

[vcpkg] EOL LF for ci.baseline.txt #12513

Merged
merged 2 commits into from
Jul 31, 2020
Merged

[vcpkg] EOL LF for ci.baseline.txt #12513

merged 2 commits into from
Jul 31, 2020

Conversation

Neumann-A
Copy link
Contributor

@JackBoosY JackBoosY self-assigned this Jul 21, 2020
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Jul 21, 2020
@JackBoosY
Copy link
Contributor

@ras0219-msft @strega-nil I think we should add a step to check whether the format of ci.baseline.txt is correct.

@Neumann-A
Copy link
Contributor Author

@JackBoosY: Let git handle it for you automatically ;) https://docs.github.com/en/github/using-git/configuring-git-to-handle-line-endings . No checks needed. Resolving merge conflicts in the ci.baseline.txt via github should also work again since github will no longer autconvert to crlf.

@JackBoosY JackBoosY added the category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) label Jul 21, 2020
@JackBoosY
Copy link
Contributor

It is difficult to mark label in this PR, but I prefer to use vcpkg bug here.

@JackBoosY JackBoosY changed the title EOL LF for ci.baseline.txt [vcpkg] EOL LF for ci.baseline.txt Jul 21, 2020
strega-nil
strega-nil approved these changes Jul 21, 2020
View reviewed changes
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

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

Yeah, LGTM!

@JackBoosY
Copy link
Contributor

We need to handle the qt5-imageformats regression as soon as possible.

@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil strega-nil merged commit 3edf825 into microsoft:master Jul 31, 2020
@Neumann-A Neumann-A deleted the eol_lf_for_ci_baseline branch July 31, 2020 21:04
hellozee pushed a commit to hellozee/vcpkg that referenced this pull request Sep 11, 2020
@Neumann-A @hellozee
[vcpkg] EOL LF for ci.baseline.txt (microsoft#12513)
7a2074d 
* define line endings for ci.baseline.txt

* renormalize line endings to lf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@strega-nil strega-nil strega-nil approved these changes

@JackBoosY JackBoosY JackBoosY approved these changes

Assignees

@JackBoosY JackBoosY

Labels
category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Neumann-A @JackBoosY @strega-nil